[Pkg-owncloud-commits] [owncloud] 08/20: Merge pull request #17630 from owncloud/stable7-rescanversionsonlyonce

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 374dd3cbcb78e84e8246fb4f63c376e697943f8b
Merge: f4aa78c 895285a
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Jul 14 14:04:26 2015 +0200

    Merge pull request #17630 from owncloud/stable7-rescanversionsonlyonce
    
    [stable7] Only rescan versions once in trashbin

 apps/files_trashbin/lib/trashbin.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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