j2blake 416f142526 Merge branch 'maint-rel-1.6' into develop		2014-01-09 18:25:32 -05:00
..
edu/cornell/mannlib	VIVO-662 Remove duplicate rows from the SPARQL query results.	2014-01-09 17:33:25 -05:00
freemarker/ext/dump	NIHVIVO-3113 fix values for null objects in dump	2011-08-09 23:20:42 +00:00
stubs	Make DeveloperSettings a singleton, and other improvements.	2014-01-04 14:22:29 -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