Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored c120e7fcab8M
Merge branches '2.0-webclient' and 'feature/SHRINE2020-80-client-side-representation' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-80-client-side-representation # Conflicts: # frontend/shrine-webclient/v2/src/components/QueryDefinitionContainer/index.js # frontend/shrine-webclient/v2/src/components/QueryDefinitionView/QueryTermGroupSettings/__tests__/__snapshots__/QueryTermGroupSettings.spec.js.snap # frontend/shrine-webclient/v2/src/components/QueryDefinitionView/QueryTermGroupSettings/index.js
Showing diff to59ff253653e