Merge branch 'renky/ispconfig3-master'

Marius Cramer

2015-01-21 82cf1e84254fc9023b4871ba40967cc4966c9452

 interface/web/admin/templates/system_config_sites_edit.htm

@@ -52,6 +52,12 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='backups_include_into_web_quota_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='backups_include_into_web_quota'}
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='reseller_can_use_options_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='reseller_can_use_options'}
@@ -69,7 +75,6 @@
                    {tmpl_var name='default_dbserver'}
                </select></div>
            </div>
        
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">