Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 6a70fcc3e57M
Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-54-create-lucene-index-for-the # Conflicts: # services/ontology/src/test/scala/net/shrine/api/ontology/OntologyServiceTest.scala
Showing diff to1f73f61632d