Stian Thorgersen 97b0558f71 Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master ...

Conflicts:
	forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html
	forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html
	forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html

2015-07-16 16:31:16 +02:00

..

account-api

Bump version

2015-06-12 14:35:34 +02:00

account-freemarker

KEYCLOAK-1487 Support for multiple values of one UserModel attribute. LDAP multivalued attribute support

2015-06-29 14:56:40 +02:00

common-freemarker

KEYCLOAK-1487 Support for multiple values of one UserModel attribute. LDAP multivalued attribute support

2015-06-29 14:56:40 +02:00

common-themes

Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master

2015-07-16 16:31:16 +02:00

email-api

Bump version

2015-06-12 14:35:34 +02:00

email-freemarker

Bump version

2015-06-12 14:35:34 +02:00

login-api

form action refactor

2015-07-01 14:07:02 -04:00

login-freemarker

form action refactor

2015-07-01 14:07:02 -04:00

pom.xml

Bump version

2015-06-12 14:35:34 +02:00