[Pkg-owncloud-commits] [owncloud] 146/457: Merge pull request #15985 from owncloud/hotfix/fix-encryption-references

[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 9366dde8756a0f11dfcbb4b95002c6710fc6b846
Merge: 07c6e52 7d26666
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Tue May 26 17:28:27 2015 +0200

    Merge pull request #15985 from owncloud/hotfix/fix-encryption-references
    
    [enc2] fix references to legacy encryption app name

 apps/files_trashbin/lib/helper.php     |  3 ---
 apps/files_trashbin/lib/trashbin.php   | 26 --------------------------
 apps/files_trashbin/tests/trashbin.php |  2 +-
 core/command/user/resetpassword.php    |  2 +-
 4 files changed, 2 insertions(+), 31 deletions(-)


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