hudajkhan 01374e5502 updates for individuals via solr field options ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSolrQueryOptions.java		2013-10-31 15:48:42 -04:00
..
buildutils	merging develop into dev-isf	2013-09-10 09:08:55 -04:00
licenser	VIVO-4 remove the license substitution code from the license scanner	2013-08-26 14:56:54 -04:00
testContentNegotiation	Adding test for content negotiation	2013-09-27 16:03:28 -04:00
testrunner	updates for individuals via solr field options	2013-10-31 15:48:42 -04:00