Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored cdc6410d739M
Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-501 # Conflicts: # adapter/service/src/main/scala/net/shrine/adapter/dao/QueryHistoryDb.scala # adapter/service/src/main/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDao.scala # adapter/service/src/test/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDaoTest.scala
Showing diff to7d24dd99f0c