[Pkg-owncloud-commits] [owncloud] 27/34: Merge pull request #11520 from owncloud/make-trash-objectstore-compatible

[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 15b39a6566c694209ae3784da510f5495de41551
Merge: 508ef23 3ce828b
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Wed Oct 15 22:24:59 2014 +0200

    Merge pull request #11520 from owncloud/make-trash-objectstore-compatible
    
    make trashbin compatible with objectstore

 apps/files_trashbin/lib/trashbin.php | 18 +++++++++++++-----
 lib/private/files/view.php           | 10 ++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)


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