Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 51b73d82c5aM
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-858 # Conflicts: # apps/shrine-api-war/pom.xml # dashboard/frontend/src/app/diagnostic/views/i2b2-connections.tpl.html # dashboard/frontend/src/app/diagnostic/views/summary.tpl.html # dashboard/service/pom.xml # dashboard/service/src/main/scala/net/shrine/api/dashboard/DashboardService.scala # pom.xml
Showing diff to6530bb1a313