vramik 39856c32d1 Merge branch 'master' of https://github.com/keycloak/keycloak into clients ... Conflicts: testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java		2015-12-07 15:44:34 +01:00
..
src/main	Merge branch 'master' of https://github.com/keycloak/keycloak into clients	2015-12-07 15:44:34 +01:00
pom.xml	Version bump	2015-12-01 19:54:28 +01:00