Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 0b6c6551a10M
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-440 # Conflicts: # qep/frontend/src/sagas/__tests__/fetchQueryUpdateSaga.spec.js # qep/frontend/src/sagas/fetchQueryUpdateSaga.js
Showing diff to5e6fefeff5e