Commits
dwalend authored 7bf2262bd96M
Merge branch 'develop' into feature/SHRINE2020-464 # Conflicts: # frontend/shrine-webclient/v1/dev-server/data/selectedQuery.js # frontend/shrine-webclient/v1/dev-server/i2b2-xml/xmlMiscommunication.xml # ontology/lucene-indexer/src/test/output/test_lucene_index.zip # ontology/lucene-indexer/src/test/output/test_lucene_index/_9.cfe # ontology/lucene-indexer/src/test/output/test_lucene_index/_9.cfs # ontology/lucene-indexer/src/test/output/test_lucene_index/_9.si # ontology/lucene-indexer/src/test/output/test_lucene_index/segments_a # ontology/lucene-indexer/src/test/output/test_lucene_index/write.lock # ontology/lucene-indexer/src/test/output/test_suggest_index.zip # ontology/lucene-indexer/src/test/output/test_suggest_index/_40.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_40.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_40.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_41.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_41.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_41.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_42.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_42.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_42.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_43.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_43.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_43.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_44.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_44.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_44.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_45.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_45.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_45.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_46.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_46.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_46.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_47.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_47.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_47.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_48.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_48.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_48.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_49.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_49.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_49.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_4a.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_4a.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_4a.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_4b.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_4b.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_4b.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_4c.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_4c.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_4c.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d.fdt # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d.fdx # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d.fnm # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d_Lucene50_0.doc # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d_Lucene50_0.tim # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d_Lucene50_0.tip # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d_Lucene80_0.dvd # ontology/lucene-indexer/src/test/output/test_suggest_index/_4d_Lucene80_0.dvm # ontology/lucene-indexer/src/test/output/test_suggest_index/_4e.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_4e.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_4e.si # ontology/lucene-indexer/src/test/output/test_suggest_index/_4f.cfe # ontology/lucene-indexer/src/test/output/test_suggest_index/_4f.cfs # ontology/lucene-indexer/src/test/output/test_suggest_index/_4f.si # ontology/lucene-indexer/src/test/output/test_suggest_index/segments_k # ontology/lucene-indexer/src/test/output/test_suggest_index/write.lock # pom.xml
Showing diff todff13eac876