[Pkg-owncloud-commits] [owncloud] 38/165: Merge pull request #15699 from owncloud/fix-15696-master

[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 f2fe9fffd934a9af2c9f9127832dd7b700633924
Merge: 85dbaee 2e803fd
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Apr 17 17:36:07 2015 +0200

    Merge pull request #15699 from owncloud/fix-15696-master
    
    Fix 15696 master

 apps/encryption/controller/statuscontroller.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

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