Commits
![Xavier Haurie](https://secure.gravatar.com/avatar/5745ebc76a6f57ed5029ec76dd410054.jpg?s=96&d=mm)
Xavier Haurie authored e6c1255114aM
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
Showing diff to8f3c3ef02bf