Merge branch 'master' into D2INT-43 · opensrp/dhis2-fhir-adapter@a884e1b · GitHub

Commit

Merge branch 'master' into D2INT-43

Browse files

# Conflicts:
#	app/src/test/java/org/dhis2/fhir/adapter/fhir/server/r4/R4ProgramStageFhirRestAppTest.java
#	fhir/src/main/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/DhisToFhirTransformerServiceImpl.java
#	fhir/src/test/java/org/dhis2/fhir/adapter/fhir/transform/dhis/impl/DhisToFhirTransformerServiceImplTest.java

Loading branch information

volsch committed Jul 24, 2019

2 parents 8af22e3 + 5a22b4c commit a884e1b