jamesagnew b222b76611 Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs ... Conflicts: hapi-fhir-android/pom.xml hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java hapi-fhir-testpage-overlay/.gitignore src/changes/changes.xml		2015-04-21 13:30:58 -04:00
..
src	Merge branch 'master' of github.com:jamesagnew/hapi-fhir into hl7org_structs	2015-04-21 13:30:58 -04:00
.classpath	Fix #103 - Don't encode contained resources unless they are actualy	2015-02-05 12:07:37 -05:00
.gitignore	Update license file generation and gitignores	2015-03-26 11:57:07 -04:00
.project	Get all of the tests passing again	2014-05-20 18:28:13 -04:00
pom.xml	Sync to DSTU2 again	2015-04-01 16:03:54 -04:00
pom.xml.versionsBackup	More resource generation	2014-04-02 18:42:16 -04:00