Merge remote-tracking branch 'upstream/master'

2014-05-20 11:38:50 -04:00 · 2014-05-20 11:38:50 -04:00 · b7cf1bb215
commit b7cf1bb215
parent b3dd349342 357337047b
2 changed files with 6 additions and 2 deletions
--- a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
+++ b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
@ -17,7 +17,9 @@

    "theme": {
        "default": "keycloak",
+        "folder": {
            "dir": "${jboss.server.config.dir}/themes"
+        }
    },

    "scheduled": {
--- a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
+++ b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
@ -17,7 +17,9 @@

    "theme": {
        "default": "keycloak",
+        "folder": {
            "dir": "${keycloak.theme.dir}"
+        }
    },

    "login-forms": {