Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 993e8ea208aM
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-309 # Conflicts: # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala
Showing diff to31040b438d2