Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 6218bd70a65
Merge branch 'release/2.1.0-M6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262 # Conflicts: # services/dashboard/src/main/scala/net/shrine/api/dashboard/DashboardService.scala # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala # services/qep/src/main/scala/net/shrine/api/qep/QueryRunner.scala # services/qep/src/test/scala/net/shrine/api/qep/QepServiceTest.scala # tools/pom.xml