Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 69d7bcb915cM
Merge branch 'release/2.1.0-M6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262 # Conflicts: # commons/http4s-util/src/main/scala/net/shrine/http4s/auth/BasicAuthentication.scala # commons/http4s-util/src/main/scala/net/shrine/http4s/auth/UserAuthentication.scala # commons/http4s-util/src/test/scala/net/shrine/http4s/auth/BasicAuthenticationTest.scala # commons/http4s-util/src/test/scala/net/shrine/http4s/auth/BearerAuthenticationTest.scala # pom.xml # 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
Showing diff to63165a5db53