[Pkg-owncloud-commits] [owncloud] 49/223: Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings

[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 354cace14ae01e7ff34af3c8a4a3335b89596da3
Merge: dff4ad3 72436b6
Author: Bernhard Posselt <Raydiation at users.noreply.github.com>
Date:   Thu Jun 12 14:33:13 2014 +0200

    Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings
    
    fix liskov substitution principle in admin mail template settings

 apps/files_sharing/appinfo/routes.php                     | 2 +-
 apps/files_sharing/controller/adminsettingscontroller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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