Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored b75005a7707M
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1351 Conflicts: docker/custom-lifecycle/src/main/resources/META-INF/plexus/components.xml
Showing diff to1c39078eea6