[Pkg-owncloud-commits] [owncloud] 71/223: Merge pull request #8714 from owncloud/minor-fixes

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit b91db840502ee3c398c63c70b8a0bd1d789c4338
Merge: 083cf63 cea2c77
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 13 08:30:57 2014 +0200

    Merge pull request #8714 from owncloud/minor-fixes
    
    fix some minor issues

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

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