Jim Blake 2fa9583569 Merge branch 'develop' into feature/fauxEditing ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java		2014-11-09 16:14:48 -05:00
..
edu/cornell/mannlib	Merge branch 'develop' into feature/fauxEditing	2014-11-09 16:14:48 -05:00
freemarker/ext/dump	NIHVIVO-3113 fix values for null objects in dump	2011-08-09 23:20:42 +00:00
stubs	Merge branch 'develop' into feature/fauxEditing	2014-10-27 14:20:56 -04: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