[Pkg-owncloud-commits] [owncloud] 290/457: Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions

[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 a90a84b0a79d6688dda660cd3d7ffd1d71fd21ab
Merge: 00742a9 61356b5
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jun 3 16:03:31 2015 +0200

    Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
    
    Keep versions when deleting as recipient

 apps/files_trashbin/lib/trashbin.php  |  18 +++---
 apps/files_trashbin/tests/storage.php | 116 ++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 9 deletions(-)

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