Bill Burke 5a22b360f1 resolve conflicts		2017-09-15 16:37:35 -04:00
..
integration-arquillian	resolve conflicts	2017-09-15 16:37:35 -04:00
integration-deprecated	Merge pull request #4451 from glavoie/KEYCLOAK-4858-ResourceServer	2017-09-12 15:54:16 -03:00
jetty	KEYCLOAK-5123 rename integration to integration-deprecated	2017-08-30 05:21:30 +02:00
proxy	KEYCLOAK-5123 rename integration to integration-deprecated	2017-08-30 05:21:30 +02:00
tomcat6	KEYCLOAK-5123 rename integration to integration-deprecated	2017-08-30 05:21:30 +02:00
tomcat7	KEYCLOAK-5123 rename integration to integration-deprecated	2017-08-30 05:21:30 +02:00
tomcat8	KEYCLOAK-5123 rename integration to integration-deprecated	2017-08-30 05:21:30 +02:00
utils	KEYCLOAK-5354 (#4440)	2017-08-30 07:59:47 +02:00
pom.xml	KEYCLOAK-5123 rename integration to integration-deprecated	2017-08-30 05:21:30 +02:00