James Agnew 094a617644 Merge branch 'versions' ...

Conflicts:
	hapi-fhir-base/examples/pom.xml
	hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java
	hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
	hapi-fhir-base/testmindeps/pom.xml
	hapi-fhir-jpaserver-uhnfhirtest/pom.xml
	hapi-fhir-testpage-overlay/pom.xml
	hapi-tinder-plugin/pom.xml
	hapi-tinder-test/pom.xml
	restful-server-example-test/pom.xml
	restful-server-example/.settings/org.eclipse.wst.common.component
	restful-server-example/pom.xml

2014-10-29 15:34:59 -04:00

..

.settings

Let server return profile info if configured to do so

2014-08-21 00:34:19 -04:00

src

Merge branch 'versions'

2014-10-29 15:34:59 -04:00

.classpath

Merge branch 'versions'

2014-10-29 15:34:59 -04:00

.gitignore

Getting profile generation working

2014-03-10 12:43:49 -04:00

.project

Get all of the tests passing again

2014-05-20 18:28:13 -04:00

pom.xml

Merge branch 'versions'

2014-10-29 15:34:59 -04:00

pom.xml.orig

Merge branch 'versions'

2014-10-29 15:34:59 -04:00

pom.xml.versionsBackup

More resource generation

2014-04-02 18:42:16 -04:00