Commits
![Xavier Haurie](https://secure.gravatar.com/avatar/5745ebc76a6f57ed5029ec76dd410054.jpg?s=96&d=mm)
Xavier Haurie authored f39b5a5dca1M
Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1 Conflicts: qep/service/src/main/scala/net/shrine/qep/staticdata/StaticDataService.scala qep/service/src/test/resources/shrine.conf
Showing diff toc7755835a7b