OpenID-Connect-Java-Spring-.../openid-connect-server
Amanda Anganes bbf9591c92 Merge branch 'master' into issue52
Conflicts:
	openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
	openid-connect-server/src/main/webapp/WEB-INF/spring-servlet.xml
	openid-connect-server/src/main/webapp/WEB-INF/views/oauth/approve.jsp
2012-06-11 15:04:01 -04:00
..
.settings cleaned up bad config file 2012-06-05 16:42:26 -04:00
db/tables cleaned up sql table references to redirect uris, see #48 2012-06-05 11:45:06 -04:00
src Merge branch 'master' into issue52 2012-06-11 15:04:01 -04:00
.classpath see issue #19 2012-05-30 15:14:15 -04:00
.gitignore moved server to new package location 2012-03-16 15:01:53 -04:00
.project slight sequence diagrams tweaks, mods to account-chooser and openid-connect-client 2012-05-16 21:12:58 -04:00
.springBeans added config bean 2012-05-09 15:20:15 -04:00
pom.xml version needed to be modified to 0.1-SNAPSHOT in order to deploy snapshot to nexus 2012-04-13 13:43:39 -04:00