Merge branch 'master' of github.com:znc/znc

This commit is contained in:
Alexey Sokolov
2015-03-06 20:57:50 +00:00
9 changed files with 60 additions and 124 deletions
@@ -129,16 +129,6 @@
<? INC encoding_settings.tmpl ?>
</div>
<div class="subsection">
<div class="inputlabel">Strip Controls:</div>
<div class="checkbox">
<input type="checkbox" name="stripcontrols" id="stripcontrols_checkbox"
title="Strips control codes (Colors, Bold, ..) from channel and private messages."
<? IF StripControls ?>checked="checked"<? ENDIF ?> />
<label for="stripcontrols_checkbox">Enabled</label>
</div>
</div>
<div style="clear: both;"></div>
</div>
</div>