Commits
![Xavier Haurie](https://secure.gravatar.com/avatar/5745ebc76a6f57ed5029ec76dd410054.jpg?s=96&d=mm)
Xavier Haurie authored 74c8e2cc7acM
Merge branch '2.0-webclient' into feature/SHRINE2020-146-display-inactive-codes # Conflicts: # services/ontology/src/test/resources/lucene_test_index/_0.cfe # services/ontology/src/test/resources/lucene_test_index/_0.cfs # services/ontology/src/test/resources/lucene_test_index/_0.si # services/ontology/src/test/resources/lucene_test_index/segments_1 # tools/create-ontology-lucene-index/src/main/scala/net/shrine/ontology/indexer/LuceneIndexer.scala
Showing diff to5774d96377d