Commits
marc-danie authored 5946aca89fbM
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: # services/ontology/src/main/scala/net/shrine/api/ontology/OntologyService.scala
Showing diff toaa613cf496c