diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 03:15:08 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-06 03:15:08 +0400 |
| commit | 32b29c9d735ae235641a7ea3869c14d7eb69cb4f (patch) | |
| tree | 63e4e269bd33b0688965c9b3b1059466a8f502b8 /settings/routes.php | |
| parent | 6de370b64cb8f7fcd9d3bd090b8d801d91d2fcca (diff) | |
| parent | 1785c0c9b9fcdc6e9a8e58f13f45e5b53364882a (diff) | |
Merge branch 'master' into fix-7307
Conflicts:
core/js/router.js
settings/js/admin.js
Diffstat (limited to 'settings/routes.php')
| -rw-r--r-- | settings/routes.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/settings/routes.php b/settings/routes.php index 7d94f130088..6954bd3823d 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -75,5 +75,8 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php') $this->create('settings_mail_settings', '/settings/admin/mailsettings') ->post() ->action('OC\Settings\Admin\Controller', 'setMailSettings'); +$this->create('settings_admin_mail_test', '/settings/admin/mailtest') + ->post() + ->action('OC\Settings\Admin\Controller', 'sendTestMail'); $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php') ->actionInclude('settings/ajax/setsecurity.php'); |