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
..
com/hp/hpl/jena/rdf/model	VIVO-12 NIHVIVO-4011 Improve LocaleSelectionFilter. Clean up comments.	2013-02-07 16:06:49 -05:00
edu/cornell/mannlib/vitro/webapp	Merge remote-tracking branch 'origin/develop' into dev-isf	2013-09-23 16:19:05 -04:00
freemarker/cache	NIHVIVO-3628 Create unit tests to cover the parsing and interpreting of custom list view config files.	2012-02-21 17:06:55 +00:00
javax	VIVO-235 Reduce "deprecation" messages in the build	2013-08-01 16:06:59 -04:00
org/apache/solr/client/solrj	Add some unit tests to JsonServlet	2012-04-30 19:47:37 +00:00