Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 04f5f0abc6fM
Merge branches 'develop' and 'feature/SHRINE-3186-remove-shrine-proxy-war-file' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3186-remove-shrine-proxy-war-file
Showing diff tob680c0e1cf3