ianmarshall 4d378ee0ed Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch ... # Conflicts: # hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java # hapi-fhir-jpaserver-base/pom.xml # hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java # hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ISearchParamExtractor.java		2020-05-22 17:04:01 -04:00
..
main	Merge remote-tracking branch 'remotes/origin/master' into im_20200316_lastn_operation_elasticsearch	2020-05-22 17:04:01 -04:00
test	Force UTF-8 on all sources to hopefully avoid compile issues on Windows	2015-08-28 11:35:12 -04:00