Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 6287f4fe492M
Merge branches 'develop' and 'feature/SHRINE2020-499' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-499 # Conflicts: # adapter/service/src/main/scala/net/shrine/adapter/dao/QueryHistoryDb.scala
Showing diff tof6f948f5f22