3 Commits

Author	SHA1	Message	Date
jamesagnew	66bb291e04	Merge branch 'master' of github.com:jamesagnew/hapi-fhir ... Conflicts: examples/pom.xml.orig hapi-deployable-pom/pom.xml hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/resource/BaseOperationOutcome.java hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/IServerInterceptor.java hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component hapi-fhir-structures-dev/.gitignore hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/context/CustomObservation.java hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderStructuresMojo.java hapi-tinder-plugin/src/main/resources/vm/resource.vm hapi-tinder-plugin/src/main/resources/vm/resource_dstu.vm pom.xml restful-server-example/.settings/org.eclipse.wst.common.component restful-server-example/.settings/org.eclipse.wst.common.component.orig src/changes/changes.xml src/site/resources/svg/restful-server-interceptors.svg src/site/site.xml	2014-11-08 10:58:35 -05:00
jamesagnew	23a8b12b5e	Removing cruft files	2014-04-24 07:32:10 -04:00
jamesagnew	b15462ddca	Merge branch 'master' of ssh://git.code.sf.net/p/hl7api/fhircode ... Conflicts: hapi-fhir-base/pom.xml hapi-fhir-structures-dstu/pom.xml hapi-tinder-plugin/pom.xml hapi-tinder-test/pom.xml pom.xml	2014-04-24 07:31:12 -04:00