[Pkg-owncloud-commits] [owncloud] 96/123: Merge pull request #16273 from owncloud/trash-fixrestoreuniquename

[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 02912aef5839099c5d98e83dccd14095ff9db9e1
Merge: e1923ba f86699c
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Fri May 15 14:48:00 2015 +0200

    Merge pull request #16273 from owncloud/trash-fixrestoreuniquename
    
    Fix restoring files from trash with unique name

 apps/files_trashbin/lib/trashbin.php   |  17 +-
 apps/files_trashbin/tests/trashbin.php | 327 +++++++++++++++++++++++++++++++++
 2 files changed, 338 insertions(+), 6 deletions(-)

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