Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 41eae238711
Merge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-173 # Conflicts: # frontend/shrine-webclient/v2/src/models/QueryResult.js # frontend/shrine-webclient/v2/src/reducers/__tests__/selectedQueryReducer.spec.js # frontend/shrine-webclient/v2/src/reducers/selectedQueryReducer.js # services/qep/src/test/scala/net/shrine/api/qep/QepServiceTest.scala