Justin Richer 565364aa9d Merge branch 'master' into multiparty ... # Conflicts: # uma-server/src/main/java/org/mitre/uma/web/AuthorizationRequestEndpoint.java		2016-01-22 18:18:16 -05:00
..
src	Merge branch 'master' into multiparty	2016-01-22 18:18:16 -05:00
.gitignore	Merge commit '023dd440d4a0e6e59a14c88013837d79a77c74e0' into 1.1-merge	2013-07-29 16:21:20 -04:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2016-01-21 15:55:56 -05:00