wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into update_shipped_apps_from_appstore

Browse source
This commit is contained in:
Georg Ehrke 2014-05-31 17:55:01 +02:00
commit c6dc9aeda8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/js/js.js
View file

@ -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'],
/**