Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 28810919c1eM
Merge branches 'develop' and 'feature/SHRINE2020-145-modify-authenticated-web-client' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-145-modify-authenticated-web-client # Conflicts: # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala
Showing diff to3397d8c1330