Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 6275cc2b5f5M
Merge branch 'feature/SHRINE2020-507' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-507 # Conflicts: # qep/service/src/main/scala/net/shrine/qep/QepService.scala
Showing diff to33fb6f81569