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
..
main	Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master	2015-07-16 16:31:16 +02:00