James Lu 5f6337a734 Merge branch 'master' into devel ... Conflicts: plugins/networks.py		2016-12-18 00:15:24 -08:00
..
__init__.py	Make plugins/ and protocols/ namespaces	2016-07-20 23:55:26 -07:00
clientbot.py	clientbot: delete channels on kick / part, or if a channel becomes empty after parting	2016-12-16 20:50:36 -08:00
hybrid.py	Merge branch 'master' into devel	2016-12-18 00:15:24 -08:00
inspircd.py	Merge branch 'master' into devel	2016-12-18 00:15:24 -08:00
ircs2s_common.py	protocols: implement basic nick collision detection in UID handlers	2016-12-18 00:13:42 -08:00
nefarious.py	Merge branch 'master' into devel	2016-12-18 00:15:24 -08:00
ratbox.py	core, protocols: add server argument to IrcUser (#355)	2016-11-09 18:40:16 -08:00
ts6_common.py	Move handle_error() to the generic protocol	2016-08-08 18:12:07 -07:00
ts6.py	Merge branch 'master' into devel	2016-12-18 00:15:24 -08:00
unreal.py	Merge branch 'master' into devel	2016-12-18 00:15:24 -08:00