keycloak-scim/services/src
Stian Thorgersen d00e0021b6 Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master
Conflicts:
	connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-master.xml
	services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java
2015-05-11 13:36:30 +02:00
..
main Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master 2015-05-11 13:36:30 +02:00
test/java/org/keycloak/test KEYCLOAK-676 Validate email address format during registration or account mgmt 2014-09-11 20:05:00 +02:00