Merge branch 'origin-master' into spring-pr

# Conflicts: # pom.xml # src/main/java/ca/uhn/fhir/jpa/empi/EmpiConfig.java
2020-09-04 23:50:06 +02:00
parent 5f237256ca c9c944d236
commit 6eb46d2b39
10 changed files with 152 additions and 144 deletions
--- a/src/main/resources/empi-rules.json
+++ b/src/main/resources/empi-rules.json
@@ -1,4 +1,5 @@
 {
+  "version": "1",
  "candidateSearchParams": [
    {
      "resourceType": "Patient",