Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-02-03 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf

 interface/web/mail/templates/mail_alias_edit.htm

@@ -25,7 +25,12 @@
                    {tmpl_var name='active'}
                </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'}
                </div>
            </div>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <input type="hidden" name="type" value="alias">