Justin Richer 8352145d82 Merge branch 'master' into authorization-api ... Conflicts: openid-connect-common/src/main/java/org/mitre/oauth2/service/SystemScopeService.java openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml openid-connect-server/src/main/java/org/mitre/discovery/web/DiscoveryEndpoint.java openid-connect-server/src/main/java/org/mitre/oauth2/web/IntrospectionEndpoint.java openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultIntrospectionAuthorizer.java		2015-03-13 18:39:26 -04:00
..
src	Merge branch 'master' into authorization-api	2015-03-13 18:39:26 -04:00
.gitignore	refactored project into four modules:	2013-09-23 17:19:09 -04:00
pom.xml	added UMA to version number	2015-02-19 17:55:25 -05:00