[Pkg-owncloud-commits] [owncloud] 45/165: Merge pull request #15708 from owncloud/fix-capitalization

[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 34841ea5ddfef0bff9684d68770496af211257fd
Merge: ae681f0 b083b65
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Apr 17 21:16:43 2015 +0200

    Merge pull request #15708 from owncloud/fix-capitalization
    
    fix capitalization for server-side encryption and email server

 settings/admin.php           | 4 ++--
 settings/templates/admin.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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