Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 60ac2d9f112M
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient # Conflicts: # apps/shrine-api-app/src/main/scala/net/shrine/api/Bootstrap.scala # commons/protocol/src/test/scala/net/shrine/protocol/version/v1/JsonTest.scala # hub/broadcaster-service/pom.xml
Showing diff to4615e9b515b