From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 6 Mar 2013 02:54:32 +0000 (-0500)
Subject: Merge branch 'master' into shared-folder-etags
X-Git-Tag: v5.0.0~4^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4dcbaa1d7bf3c94a92ac8a848305913e57a17ec5;p=nextcloud-server.git

Merge branch 'master' into shared-folder-etags

Conflicts:
	apps/files_sharing/appinfo/app.php
---

4dcbaa1d7bf3c94a92ac8a848305913e57a17ec5
diff --cc apps/files_sharing/appinfo/app.php
index f8326db45bb,5b5893abc93..c9237a4b3a4
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@@ -1,12 -1,11 +1,12 @@@
  <?php
  
- OC::$CLASSPATH['OC_Share_Backend_File'] = "apps/files_sharing/lib/share/file.php";
- OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'apps/files_sharing/lib/share/folder.php';
- OC::$CLASSPATH['OC\Files\Storage\Shared'] = "apps/files_sharing/lib/sharedstorage.php";
- OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'apps/files_sharing/lib/cache.php';
- OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'apps/files_sharing/lib/permissions.php';
- OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'apps/files_sharing/lib/updater.php';
- OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'apps/files_sharing/lib/watcher.php';
+ OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
+ OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';
+ OC::$CLASSPATH['OC\Files\Storage\Shared'] = 'files_sharing/lib/sharedstorage.php';
+ OC::$CLASSPATH['OC\Files\Cache\Shared_Cache'] = 'files_sharing/lib/cache.php';
+ OC::$CLASSPATH['OC\Files\Cache\Shared_Permissions'] = 'files_sharing/lib/permissions.php';
++OC::$CLASSPATH['OC\Files\Cache\Shared_Updater'] = 'files_sharing/lib/updater.php';
+ OC::$CLASSPATH['OC\Files\Cache\Shared_Watcher'] = 'files_sharing/lib/watcher.php';
  OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
  OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
  OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');