Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/b0e4bb9386c5c61f6f76d4c4d2cc7fb5.jpg?s=96&d=mm)
Marc-Danie Nazaire authored ee7151036ffM
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-977 Conflicts: kafka/src/main/docker/dev-environment/docker-compose.yml
Showing diff to2fe0e3b6fb0