keycloak-scim/testsuite/integration-arquillian/tests/adapters
Vlasta Ramik 6dd7634a77 Merge remote-tracking branch 'upstream/master' into prod
Conflicts:
	testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
	testsuite/integration-arquillian/tests/adapters/eap6/src/main/xslt/standalone.xsl
2016-01-13 12:09:34 +01:00
..
as7 Merge remote-tracking branch 'upstream/master' into prod 2016-01-13 12:09:34 +01:00
eap6 Merge remote-tracking branch 'upstream/master' into prod 2016-01-13 12:09:34 +01:00
karaf Version bump 2016-01-13 09:20:38 +01:00
tomcat Version bump 2016-01-13 09:20:38 +01:00
wildfly Merge remote-tracking branch 'upstream/master' into prod 2016-01-13 12:09:34 +01:00
wildfly-relative Version bump 2016-01-13 09:20:38 +01:00
wildfly8 Merge remote-tracking branch 'upstream/master' into prod 2016-01-13 12:09:34 +01:00
pom.xml Merge remote-tracking branch 'upstream/master' into prod 2016-01-13 12:09:34 +01:00