litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
vitro/webapp/test
History
brianjlowe 90512bdc1c Merge remote-tracking branch 'origin/develop' into dev-isf 
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
2013-09-23 16:19:05 -04:00
..
edu/cornell/mannlib Merge remote-tracking branch 'origin/develop' into dev-isf 2013-09-23 16:19:05 -04:00
freemarker/ext/dump NIHVIVO-3113 fix values for null objects in dump 2011-08-09 23:20:42 +00:00
stubs Merge remote-tracking branch 'origin/develop' into dev-isf 2013-09-23 16:19:05 -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