Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 934c8126bb0M
Merge branch 'SHRINE2020-1467-back-end' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1392 Conflicts: docker/scripts/src/main/docker/images/shrine-node/shrine.conf
Showing diff to13e18bb0fd0