Jim Blake 875ba66a46 Merge branch 'develop' into feature/fauxEditing		2014-12-08 15:55:32 -05:00
..
edu/cornell/mannlib	Merge branch 'develop' into feature/fauxEditing	2014-12-08 15:55:32 -05:00
freemarker/ext/dump	Stop 'deprecated' messages from JUnit imports.	2014-11-09 16:22:25 -05:00
stubs	Merge branch 'develop' into feature/fauxEditing	2014-12-08 15:55:32 -05:00
testontologies	SolrQueryTest doesn't work with vivo, setting to @Ignore	2013-07-09 16:55:29 -04:00
commons-logging.properties	Normalize line endings VIVO-101	2013-07-18 15:19:53 -04:00
log4j.properties	Normalize line endings VIVO-101	2013-07-18 15:19:53 -04:00