Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 1a80e13bbb6M
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-379 # Conflicts: # services/ontology/src/main/scala/net/shrine/api/ontology/LabDetail.scala
Showing diff toc1c07a7af34