[Pkg-owncloud-commits] [owncloud] 112/131: Merge pull request #17911 from owncloud/fix-enc-wrapper-without-encryption-stable8.1

[David Prévot]

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

taffit pushed a commit to annotated tag v8.1.1
in repository owncloud.

commit a949f6c5762c12f53559fb4329a9ec9e7ce5b415
Merge: e8cbfd1 e25a116
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Jul 27 19:29:52 2015 +0200

    Merge pull request #17911 from owncloud/fix-enc-wrapper-without-encryption-stable8.1
    
    [stable8.1] Fix enc wrapper without encryption stable8.1

 apps/files/appinfo/update.php                    | 96 ++++++++++++++++++++++++
 apps/files/appinfo/version                       |  2 +-
 lib/private/files/storage/wrapper/encryption.php |  2 +-
 tests/lib/files/storage/wrapper/encryption.php   | 61 ++++++++++++++-
 version.php                                      |  2 +-
 5 files changed, 159 insertions(+), 4 deletions(-)


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