Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

 interface/web/mail/mail_aliasdomain_del.php

@@ -39,8 +39,8 @@
* End Form configuration
******************************************/

require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

//* Check permissions for module
$app->auth->check_module_permissions('mail');
@@ -48,4 +48,4 @@
$app->uses("tform_actions");
$app->tform_actions->onDelete();

?>
?>