j2blake 09dd8da784 Merge branch 'maint-rel-1.6' into develop		2014-03-25 15:44:59 -04:00
..
edu/cornell/mannlib	VIVO-682 Modify some auth code to work better with faux properties.	2014-03-25 15:44:10 -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-25 15:44:59 -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