Commits
marc-danie authored 351c0006f28M
Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-129-allow-a-user-to-select-any # Conflicts: # tools/create-ontology-lucene-index/src/main/scala/net/shrine/ontology/indexer/LuceneIndexer.scala # tools/create-ontology-lucene-index/src/test/resources/category_definition.txt # tools/create-ontology-lucene-index/src/test/resources/category_definition_with_unicode_characters.txt
Showing diff tob9584762547