Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 48a1b94af83M
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-659 # Conflicts: # qep/frontend/src/components/QueryDefinitionView/QueryDefinitionView.js # qep/frontend/src/components/QueryDefinitionView/QueryTermGroupView/index.js # qep/frontend/src/reducers/queryDefinitionReducer/index.js # qep/frontend/src/reducers/queryDefinitionReducer/queryGroupReducer.js
Showing diff tob096a334367