agazzarini bcbcbedff0 Merge branches 'feature/SEARCH-2090' and 'release/V2.0.x' of https://git.alfresco.com/search_discovery/insightengine into feature/SEARCH-2090 ...

 Conflicts:

	search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/schema.xml

	search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java

2020-03-09 16:59:10 +01:00

..

src

Merge branch 'master' into 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.88'

2020-03-04 15:51:18 +00:00

config.properties

Search-1704: Fix solr.in.cmd to start with Java 11

2019-06-21 17:03:28 +01:00

pom.xml

Merge branches 'feature/SEARCH-2090' and 'release/V2.0.x' of https://git.alfresco.com/search_discovery/insightengine into feature/SEARCH-2090

2020-03-09 16:59:10 +01:00