Tomas Kyjovsky 6d7092ef4c Merge upstream-master into KEYCLOAK-1642 ... Conflicts: testsuite/integration-arquillian/tests/adapters/eap6/pom.xml testsuite/integration-arquillian/tests/adapters/pom.xml		2016-01-20 16:12:20 +01:00
..
adapters/eap7	Merge upstream-master into KEYCLOAK-1642	2016-01-20 16:12:20 +01:00
base	Merge upstream-master into KEYCLOAK-1642	2016-01-20 16:12:20 +01:00
other	KEYCLOAK-1642 Added profile for enabling console UI tests. Disabled by default.	2016-01-20 09:07:07 +01:00
pom.xml	Merge upstream-master into KEYCLOAK-1642	2016-01-20 16:12:20 +01:00