Conflicts: openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java openid-connect-server/src/main/java/org/mitre/oauth2/web/OAuthConfirmationController.java openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java |
||
|---|---|---|
| .. | ||
| META-INF | ||
| main/java/org/mitre | ||
| test/java/org/mitre | ||