mirror of
https://github.com/znc/znc.git
synced 2026-05-18 07:15:54 +02:00
Merge branch '1.6.x'
This commit is contained in:
@@ -136,7 +136,7 @@
|
||||
<script type="text/javascript">floodprotection_change();</script>
|
||||
|
||||
<div style="clear:both;"></div>
|
||||
<div class="subsection" title="Character encoding used between ZNC and IRC server. After changing this, reconnect ZNC to server.">
|
||||
<div class="subsection" title="Character encoding used between ZNC and IRC server.">
|
||||
<div class="inputlabel">Server encoding:</div>
|
||||
<? INC encoding_settings.tmpl ?>
|
||||
</div>
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
</datalist>
|
||||
</div>
|
||||
<div style="clear:both;"></div>
|
||||
<div class="subsection" title="Character encoding used between IRC client and ZNC. After changing this, reconnect client to ZNC.">
|
||||
<div class="subsection" title="Character encoding used between IRC client and ZNC.">
|
||||
<div class="inputlabel">Client encoding:</div>
|
||||
<? INC encoding_settings.tmpl ?>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user