brianjlowe 754c8004ae Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java		2013-10-31 10:45:51 -04:00
..
edu/cornell/mannlib	VIVO-268 Restore data values to DataProperty RequestedAction classes.	2013-10-26 18:02:29 -04:00
freemarker/ext/dump	NIHVIVO-3113 fix values for null objects in dump	2011-08-09 23:20:42 +00:00
stubs	various performance tweaks	2013-10-31 10:43:25 -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