Merge remote-tracking branch 'origin/master'

mherman22 · Dec 18, 2023 · 8d76ba4 · 8d76ba4
2 parents 37bcb84 + 6196a97
commit 8d76ba4
Show file tree

Hide file tree

Showing 169 changed files with 3,118 additions and 10,605 deletions.
diff --git a/api-2.1/pom.xml b/api-2.1/pom.xml
diff --git a/api-2.1/src/main/java/org/openmrs/module/fhir2/api/dao/FhirCohortMembershipDao.java b/api-2.1/src/main/java/org/openmrs/module/fhir2/api/dao/FhirCohortMembershipDao.java
diff --git a/api-2.1/src/main/java/org/openmrs/module/fhir2/api/dao/impl/FhirCohortMembershipDaoImpl.java b/api-2.1/src/main/java/org/openmrs/module/fhir2/api/dao/impl/FhirCohortMembershipDaoImpl.java
diff --git a/api-2.1/src/main/java/org/openmrs/module/fhir2/api/impl/FhirGroupMemberService_2_1.java b/api-2.1/src/main/java/org/openmrs/module/fhir2/api/impl/FhirGroupMemberService_2_1.java
diff --git a/api-2.1/src/main/java/org/openmrs/module/fhir2/api/translators/GroupComponentTranslator.java b/api-2.1/src/main/java/org/openmrs/module/fhir2/api/translators/GroupComponentTranslator.java
diff --git a/...2.1/src/main/java/org/openmrs/module/fhir2/api/translators/GroupMemberTranslator_2_1.java b/...2.1/src/main/java/org/openmrs/module/fhir2/api/translators/GroupMemberTranslator_2_1.java
diff --git a/...main/java/org/openmrs/module/fhir2/api/translators/impl/GroupComponentTranslatorImpl.java b/...main/java/org/openmrs/module/fhir2/api/translators/impl/GroupComponentTranslatorImpl.java
diff --git a/...ain/java/org/openmrs/module/fhir2/api/translators/impl/GroupMemberTranslatorImpl_2_1.java b/...ain/java/org/openmrs/module/fhir2/api/translators/impl/GroupMemberTranslatorImpl_2_1.java