Ralph O'Flinn 92d0fe98c5 Merge branch 'sprint-search' into dev-search ... # Conflicts: # installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties # webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt		2019-06-21 09:50:40 -05:00
..
home	[VIVO-1690] - Remove trailing whitespace throughout project (#126)	2019-05-03 12:51:00 -04:00
webapp	[VIVO-1690] - Remove trailing whitespace throughout project (#126)	2019-05-03 12:51:00 -04:00
example-settings.xml	updating license path	2017-04-21 17:12:47 -06:00
pom.xml	Remove embedded Solr	2019-04-03 12:25:16 -04:00