From cab3bca1d75be6c7f3140a35396d8c6ee2011801 Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Wed, 20 Jan 2016 15:16:22 -0500
Subject: [PATCH] Merge branch 'master' into dns-dnssec

---
 interface/web/mail/form/mail_forward.tform.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/interface/web/mail/form/mail_forward.tform.php b/interface/web/mail/form/mail_forward.tform.php
index 520f18d..3c89150 100644
--- a/interface/web/mail/form/mail_forward.tform.php
+++ b/interface/web/mail/form/mail_forward.tform.php
@@ -118,6 +118,12 @@
 			'default' => 'y',
 			'value'  => array(0 => 'n', 1 => 'y')
 		),
+		'allow_send_as' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'n',
+			'value'  => array(1 => 'y', 0 => 'n')
+		),
 		'greylisting' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

--
Gitblit v1.9.1