libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Bill Burke 2014-05-20 11:38:50 -04:00
commit b7cf1bb215
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
View file

@ -17,7 +17,9 @@
"theme": { "theme": {
"default": "keycloak", "default": "keycloak",
"dir": "${jboss.server.config.dir}/themes" "folder": {
"dir": "${jboss.server.config.dir}/themes"
}
}, },
"scheduled": { "scheduled": {

4
testsuite/integration/src/main/resources/META-INF/keycloak-server.json
View file

@ -17,7 +17,9 @@
"theme": { "theme": {
"default": "keycloak", "default": "keycloak",
"dir": "${keycloak.theme.dir}" "folder": {
"dir": "${keycloak.theme.dir}"
}
}, },
"login-forms": { "login-forms": {