Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored ed2cd66164dM
Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-78-technical-story-create-json # Conflicts: # commons/auth/src/main/scala/net/shrine/authorization/AllowsAllAuthorizationService.scala # commons/auth/src/main/scala/net/shrine/authorization/QueryAuthorizationService.scala # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala
Showing diff to45cd100a04b