Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/mailuser/templates/index.htm

@@ -9,23 +9,23 @@
    
        <div class="form-group">
            <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
            <p class="value">{tmpl_var name='email'}</p>
            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='email'}</div></div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
            <p class="value">{tmpl_var name='login'}</p>
            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='login'}</div></div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">{tmpl_var name='server_address_txt'}</label>
            <p class="value">{tmpl_var name='server_name'}</p>
            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='server_name'}</div></div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
            <p class="value">{tmpl_var name='quota'}</p>
            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='quota'}</div></div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
            <p class="value">{tmpl_var name='cc'}</p>
            <div class="col-sm-9"><div class="checkbox">{tmpl_var name='cc'}</div></div>
        </div>
        <div class="clear"><div class="right">
            &nbsp;