Bill Burke d1552cd6e8 resolve conflict		2016-03-30 18:23:40 -04:00
..
docs	KEYCLOAK-1241 Can't build release with Java 8	2015-09-17 14:10:15 +02:00
main	resolve conflict	2016-03-30 18:23:40 -04:00
test/java/org/keycloak/test	KEYCLOAK-1928 Fix Saml with IBM JDK	2016-02-29 17:32:33 +01:00