diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 10:00:12 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 10:00:12 +0100 |
| commit | 364b1cd3915ab8d33f1a63f598be3acb4bfcf86a (patch) | |
| tree | 401f02cc3a6b8d9ba28620fcd9ec6a31ef381ab7 /core/js/config.js | |
| parent | bfc55fef89089fc43c6a352de860374ca3fcfd53 (diff) | |
| parent | 60489764f37a6f344fa20e361a26c7a6006f9c97 (diff) | |
| download | nextcloud-server-364b1cd3915ab8d33f1a63f598be3acb4bfcf86a.tar.gz nextcloud-server-364b1cd3915ab8d33f1a63f598be3acb4bfcf86a.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/js/files.js
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 |