[Pkg-owncloud-commits] [owncloud] 214/239: Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash

[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 34a8c3c4cd7841e3a8b1730c580003736277e2d7
Merge: 39f9e16 d2840a0
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Wed Nov 27 10:24:55 2013 -0800

    Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
    
    move files to owners trash

 apps/files_sharing/appinfo/app.php   |   1 +
 apps/files_sharing/lib/updater.php   |   7 +-
 apps/files_trashbin/lib/trashbin.php | 146 ++++++++++++++++++++++++++---------
 apps/files_versions/lib/versions.php |   1 +
 4 files changed, 116 insertions(+), 39 deletions(-)


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