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
..
java/org/keycloak/testsuite	Merge remote-tracking branch 'upstream/master' into prod	2016-01-13 12:09:34 +01:00
resources	Merge remote-tracking branch 'upstream/master' into prod	2016-01-13 12:09:34 +01:00