Commits
![Carl Woolf](https://secure.gravatar.com/avatar/fe7ba70d5bd6895de38bd03c98140cde.jpg?s=96&d=mm)
Carl Woolf authored 0a767903f6fM
Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2 # Conflicts: # authz/src/main/java/net/shrine/authz/core/Statics.java # authz/src/main/java/net/shrine/authz/service/AuthorizationService.java # authz/src/main/java/net/shrine/authz/service/AuthzProvider.java # authz/src/main/java/net/shrine/authz/service/AuthzProviderUrlImpl.java # authz/src/main/java/net/shrine/authz/web/AuthorizationResource.java # shrine-setup/src/main/resources/sso/shrine/shrineSP.conf-sample
Showing diff tod7898eaf421