[Pkg-owncloud-commits] [owncloud] 74/223: Merge pull request #9010 from owncloud/fix_8941_admin_settings_message

[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 c09f5680c98d66d6e5a0fe793561194ecafed3ea
Merge: b91db84 42bf466
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Jun 13 13:07:41 2014 +0200

    Merge pull request #9010 from owncloud/fix_8941_admin_settings_message
    
    move mail template settings to templateeditor repo

 apps/files_sharing/app/sharing.php                 |  25 ----
 apps/files_sharing/appinfo/app.php                 |   3 -
 apps/files_sharing/appinfo/routes.php              |  15 ---
 .../controller/adminsettingscontroller.php         |  60 ----------
 apps/files_sharing/css/settings-admin.css          |  33 ------
 apps/files_sharing/http/mailtemplateresponse.php   |  55 ---------
 apps/files_sharing/js/settings-admin.js            |  78 -------------
 apps/files_sharing/lib/mailtemplate.php            | 126 ---------------------
 apps/files_sharing/settings-admin.php              |  21 ----
 apps/files_sharing/templates/settings-admin.php    |  41 -------
 10 files changed, 457 deletions(-)

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