Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 0abaeb36e3cM
Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-173 # Conflicts: # frontend/shrine-webclient/v2/src/models/QueryResult.js # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala # services/qep/src/test/scala/net/shrine/api/qep/QepServiceTest.scala
Showing diff to3d3fee5568b