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

More work on new structures

2015-02-18 17:00:47 -05:00

.gitignore

Remove file from VCS

2015-04-02 15:02:06 -04:00

.project

Work on android

2015-02-16 12:19:08 -05:00

pom.xml

Don't return a Content-Location header when returning the new bundle

2015-04-20 17:32:20 -04:00

pom.xml.versionsBackup

Preparing for 0.9 release

2015-03-13 08:34:52 -04:00