Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 71ce2b410bfM
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1470 Conflicts: qep/frontend/src/components/QueryDefinitionContainer/index.js qep/frontend/src/sagas/index.js qep/service/src/main/scala/net/shrine/qep/BasicQuery.scala
Showing diff to367648a6123