Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 025692bb91fM
Merge branch 'sso-phase2' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase2 Conflicts: apps/shrine-api-app/src/main/scala/net/shrine/servlet/filter/AuthorizationFilter.scala
Showing diff tod6dc230e4b0