iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-08 22:34:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
This commit is contained in:
Alexey Sokolov
2015-10-30 14:56:28 +00:00
parent 5e337647b1 096dc5b320
commit 0d8bb7e597
11 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/IRCNetwork.cpp
+1
View File
@@ -475,6 +475,7 @@ bool CIRCNetwork::ParseConfig(CConfig *pConfig, CString& sError, bool bUpgrade)
CUtils::PrintError(sError);
CZNC::DumpConfig(pSubConf);
delete pChan;
return false;
}