From ec64cf5c39c388c297607ba3ac1424f057eafaee Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Jan 2016 04:59:46 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/templates/mail_alias_edit.htm | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index 07d781c..0487926 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -28,6 +28,12 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='send_as_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='allow_send_as'} <small>{tmpl_var name='send_as_exp'}</small>
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='greylisting'}
--
Gitblit v1.9.1