keycloak-scim/model
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
..
api Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master 2015-05-11 13:36:30 +02:00
file Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master 2015-05-11 13:36:30 +02:00
invalidation-cache Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master 2015-05-11 13:36:30 +02:00
jpa Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master 2015-05-11 13:36:30 +02:00
mongo Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master 2015-05-11 13:36:30 +02:00
sessions-infinispan Version bump 2015-05-05 11:45:21 +02:00
sessions-jpa no backchannel if state 2015-05-05 13:58:07 -04:00
sessions-mem Version bump 2015-05-05 11:45:21 +02:00
sessions-mongo Version bump 2015-05-05 11:45:21 +02:00
pom.xml Version bump 2015-05-05 11:45:21 +02:00