diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-05-31 17:55:01 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-05-31 17:55:01 +0200 |
| commit | c6dc9aeda827940518a322e43670f8136eb26104 (patch) | |
| tree | eeb47afaa6e7b965228c6d67573aa10c4b0c8911 | |
| parent | 020255b4e545413fd724fbd397662f6c4265caa3 (diff) | |
| parent | 56b60b9cd283764931f24054b966d0cc6594da89 (diff) | |
| download | nextcloud-server-c6dc9aeda827940518a322e43670f8136eb26104.tar.gz nextcloud-server-c6dc9aeda827940518a322e43670f8136eb26104.zip | |
Merge branch 'master' into update_shipped_apps_from_appstore
| -rw-r--r-- | core/js/js.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index e31f67cca9c..cf35d8aac6a 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -179,9 +179,9 @@ var OC={ webroot:oc_webroot, appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false, currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false, - config: oc_config, - appConfig: oc_appconfig || {}, - theme: oc_defaults || {}, + config: window.oc_config, + appConfig: window.oc_appconfig || {}, + theme: window.oc_defaults || {}, coreApps:['', 'admin','log','search','settings','core','3rdparty'], /** |