[Pkg-owncloud-commits] [owncloud] 105/123: Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips

[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 257ee205bb2398a430849181436083eed428ca77
Merge: 2cafbc8 9727386
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri May 15 22:39:17 2015 +0200

    Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips
    
    [enc2]fixing recovery tooltip

 settings/changepassword/controller.php            |  8 ++------
 settings/controller/userscontroller.php           |  6 +++---
 tests/settings/controller/userscontrollertest.php | 18 +++++++++---------
 3 files changed, 14 insertions(+), 18 deletions(-)


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