Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 0970bb8d588M
Merge branch 'bugfix/SHRINE2020-1363-get-docker-working' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1364 Conflicts: adapter/service/src/main/sql/shrine_query_history-update-mssql.sql adapter/service/src/main/sql/shrine_query_history-update-mysql.sql adapter/service/src/main/sql/shrine_query_history-update-oracle.sql hub/service/src/main/sql/mysql-update.ddl
Showing diff to9433e0fc7d7