j2blake 50e55b62ef Merge branch 'maint-rel-1.6' into develop		2014-03-10 18:15:16 -04:00
..
edu/cornell/mannlib	VIVO-692 Restrict LOD by Publish level, not by Display level	2014-03-10 18:14:02 -04:00
freemarker/ext/dump	NIHVIVO-3113 fix values for null objects in dump	2011-08-09 23:20:42 +00:00
stubs	Merge branch 'maint-rel-1.6' into develop	2014-03-10 18:15:16 -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