Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2015-03-06 20:57:18 +00:00
2 changed files with 6 additions and 1 deletions

View File

@@ -1,4 +1,9 @@
<div class="encoding-settings">
<? IF EncodingDisabled ?>
<div>
ZNC is compiled without encodings support. <a href="http://icu-project.org/">ICU</a> is required for it.
</div>
<? ENDIF ?>
<div>
<div class="checkboxandlabel checkbox">
<input type="radio" name="encoding_utf" id="encoding_utf_legacy" value="legacy" <? IF EncodingUtf == "legacy" ?>checked="checked"<? ENDIF ?> <? IF EncodingDisabled ?>disabled="disabled"<? ENDIF ?> />