]> jfr.im git - irc/evilnet/znc.git/commitdiff
Merge branch '1.6.x'
authorAlexey Sokolov <redacted>
Sun, 12 Mar 2017 21:16:05 +0000 (21:16 +0000)
committerAlexey Sokolov <redacted>
Sun, 12 Mar 2017 21:16:05 +0000 (21:16 +0000)
1  2 
ChangeLog.md

diff --cc ChangeLog.md
Simple merge