diff options
| author | sherbrecher <oss@herbrecher.de> | 2013-03-15 17:50:02 +0100 |
|---|---|---|
| committer | sherbrecher <oss@herbrecher.de> | 2013-03-15 17:50:02 +0100 |
| commit | ec45a8433dba8140565728500050035ddad0a20e (patch) | |
| tree | fff9bf7677cf66dabdc2906f54e334c66e3d6dda /core/js/config.js | |
| parent | d2b3a9fb3bfa4d434d7d797019ec0cadec392a2b (diff) | |
| parent | ebb2cb340349929e5e1d8e73e0f4523756f69d73 (diff) | |
| download | nextcloud-server-ec45a8433dba8140565728500050035ddad0a20e.tar.gz nextcloud-server-ec45a8433dba8140565728500050035ddad0a20e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
apps/files_external/templates/settings.php
Diffstat (limited to 'core/js/config.js')
| -rw-r--r-- | core/js/config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/config.js b/core/js/config.js index f7a29276f7d..563df4e6632 100644 --- a/core/js/config.js +++ b/core/js/config.js @@ -50,6 +50,6 @@ OC.AppConfig={ }, deleteApp:function(app){ OC.AppConfig.postCall('deleteApp',{app:app}); - }, + } }; //TODO OC.Preferences |