Merge branches 'feature/SEARCH_2222_merge_master_in_2_0' and 'master' of https://git.alfresco.com/search_discovery/insightengine into feature/SEARCH_2222_merge_master_in_2_0

Browse Source

 Conflicts:

	search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java

...

This commit is contained in:

agazzarini

2020-05-06 16:02:33 +02:00

parent c5cef2ab44 e011d8faa4

commit 323459f585

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available