Merge branch '1.6.x'

Conflicts:
	src/Client.cpp
	znc-buildmod.in
This commit is contained in:
J-P Nurmi
2015-07-31 23:53:30 +02:00
7 changed files with 22 additions and 9 deletions
+1 -1
View File
@@ -72,7 +72,7 @@ public:
if (IsOnlineModNick(sNick)) {
CIRCNetwork* pNetwork = GetNetwork();
PutUser(":znc.in 311 " + pNetwork->GetCurNick() + " " + sNick + " " + sNick + " znc.in * :" + sNick);
PutUser(":znc.in 311 " + pNetwork->GetCurNick() + " " + sNick + " znc znc.in * :" + sNick);
PutUser(":znc.in 312 " + pNetwork->GetCurNick() + " " + sNick + " *.znc.in :Bouncer");
PutUser(":znc.in 318 " + pNetwork->GetCurNick() + " " + sNick + " :End of /WHOIS list.");