jamesagnew ee53c40ff8 Merge branch 'master' of github.com:jamesagnew/hapi-fhir ...

Conflicts:
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
	hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html

2014-07-03 18:35:37 -04:00

..

.settings

Fix a number of unit tests

2014-07-02 15:24:29 -04:00

src

Merge branch 'master' of github.com:jamesagnew/hapi-fhir

2014-07-03 18:35:37 -04:00

.classpath

Fix a number of unit tests

2014-07-02 15:24:29 -04:00

.gitignore

Just starting

2014-02-17 17:58:32 -05:00

.project

Fix a number of unit tests

2014-07-02 15:24:29 -04:00

build.xml

Lots of bugfixes, and narrative generator is started

2014-03-24 08:32:28 -04:00

pom.xml

Lots of tester enhancements

2014-07-02 08:57:07 -04:00

pom.xml.versionsBackup

More resource generation

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

TODO.txt

Some refactoring - Currently does not compile,will fix this afternoon

2014-04-22 08:58:28 -04:00