diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 09:53:12 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 09:53:12 +0100 |
| commit | 23896a72906f1dca08d8413ea9a339b5d74aa658 (patch) | |
| tree | 89edfcc629cfe1aac7787448338432875df63bed /core/js/config.js | |
| parent | bae175518427de1f43ac23dbc1e06a15f6933370 (diff) | |
| parent | 60489764f37a6f344fa20e361a26c7a6006f9c97 (diff) | |
| download | nextcloud-server-23896a72906f1dca08d8413ea9a339b5d74aa658.tar.gz nextcloud-server-23896a72906f1dca08d8413ea9a339b5d74aa658.zip | |
Merge branch 'master' into fixing-784-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 |