[Pkg-owncloud-commits] [owncloud] 94/457: Merge pull request #16322 from owncloud/trash-view

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 39d1e99228a22e232795b9800503697b866f5023
Merge: 1a67e5c 2213d65
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed May 20 14:44:01 2015 +0200

    Merge pull request #16322 from owncloud/trash-view
    
    dont go trough the view when moving to trash

 apps/files_trashbin/lib/trashbin.php          | 88 ++++++++++++++++++++++-----
 apps/files_trashbin/tests/storage.php         |  8 ++-
 lib/private/files/storage/common.php          | 15 ++++-
 lib/private/files/storage/wrapper/wrapper.php |  8 +++
 tests/lib/files/storage/storage.php           | 37 +++++++----
 5 files changed, 125 insertions(+), 31 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git