diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-25 12:49:54 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-25 12:49:54 +0100 |
| commit | 50f6817ce99f3870e1e8dea92eaa35a0c40553ba (patch) | |
| tree | af5dc3fbc1755312e2c8dbe28eab6b3a13d1693e /apps/files_trashbin | |
| parent | 60682e17047df19c9486bfc21a993e08bbfce5ce (diff) | |
| parent | a95d4c2b22e2cf0deb4958bc3aa3b20ed9d0463c (diff) | |
| download | nextcloud-server-50f6817ce99f3870e1e8dea92eaa35a0c40553ba.tar.gz nextcloud-server-50f6817ce99f3870e1e8dea92eaa35a0c40553ba.zip | |
Merge pull request #20439 from owncloud/etag-propagate-in-storage
Take submount etag into account for folder etags
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/tests/trashbin.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index e28b854ca1f..934f831ef74 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -65,7 +65,6 @@ class Test_Trashbin extends \Test\TestCase { \OC::registerShareHooks(); $application = new \OCA\Files_Sharing\AppInfo\Application(); $application->registerMountProviders(); - $application->setupPropagation(); //disable encryption \OC_App::disable('encryption'); |