Stian Thorgersen a2c4a1f760 Merge branch 'KEYCLOAK-1113' of https://github.com/velias/keycloak into velias-KEYCLOAK-1113 ... Conflicts: services/src/main/java/org/keycloak/services/resources/LoginActionsService.java		2015-04-01 09:45:13 +02:00
..
main	Merge branch 'KEYCLOAK-1113' of https://github.com/velias/keycloak into velias-KEYCLOAK-1113	2015-04-01 09:45:13 +02:00
test/java/org/keycloak/models	add localization support to realm	2015-03-14 14:08:06 +01:00