[Pkg-owncloud-commits] [owncloud] 155/215: Merge pull request #15706 from owncloud/fix-15705-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 3e06fd934238f345220254e4b197f11413421912
Merge: fa6cb49 c6e2439
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Wed Apr 29 09:36:34 2015 +0200

    Merge pull request #15706 from owncloud/fix-15705-master
    
    move creation of shared key to the login handler

 apps/encryption/lib/keymanager.php  | 8 +++++---
 apps/encryption/lib/users/setup.php | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)


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