diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 12:18:21 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 12:18:21 +0100 |
| commit | 7ebfcab49bf0ceac7f32a66f393ebdadc5d64a77 (patch) | |
| tree | 5ecc27782038f3e20b385e0703eebbb3d0edde29 /apps | |
| parent | a867b36e7f99c648252ba2a1c04888ba21c1405f (diff) | |
| parent | da7a14e9a6cc5a388ae817a226af7fa262fe6846 (diff) | |
| download | nextcloud-server-7ebfcab49bf0ceac7f32a66f393ebdadc5d64a77.tar.gz nextcloud-server-7ebfcab49bf0ceac7f32a66f393ebdadc5d64a77.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
lib/helper.php
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/appinfo/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 109f86b2e87..0104d0d017f 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -6,4 +6,4 @@ OC::$CLASSPATH['OC_Filestorage_Shared'] = "apps/files_sharing/lib/sharedstorage. OCP\Util::connectHook('OC_Filesystem', 'setup', 'OC_Filestorage_Shared', 'setup'); OCP\Share::registerBackend('file', 'OC_Share_Backend_File'); OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file'); -OCP\Util::addScript('files_sharing', 'share'); +OCP\Util::addScript('files_sharing', 'share');
\ No newline at end of file |