Merge branch '1.6.x'

This commit is contained in:
Alexey Sokolov
2015-06-05 08:05:00 +01:00
@@ -316,9 +316,10 @@
<? ENDLOOP ?>
</textarea></div>
<br /><span class="info">One reply per line. Example: TIME Buy a watch!</span>
<br /><span class="info"><a href="http://wiki.znc.in/ExpandString" target="_blank" class="external">Substitutions</a> are available</span>
</div>
<div class="subsection" id="ctcpreplies_js" style="display:none">
<div>CTCP Replies:</div>
<div class="inputlabel">CTCP Replies:</div>
<div>
<table style="width:100%">
<thead>
@@ -331,6 +332,7 @@
<tbody id="ctcpreplies_tbody"/>
</table>
<input type="button" value="Add" id="ctcpreplies_add"/>
<span class="info"><a href="http://wiki.znc.in/ExpandString" target="_blank" class="external">Substitutions</a> are available</span>
<datalist id="ctcpreplies_list">
<option value="PING"/>
<option value="FINGER"/>