James Lu 043a4bc27a Merge branch 'devel' into wip/admin-commands-loopback ... Conflicts: plugins/relay.py		2015-08-15 19:21:38 -07:00
..
admin.py	plugins/admin: make command sending loop via hooks	2015-08-15 05:12:49 -07:00
commands.py	utils.isOper: check for both umode +o and login status	2015-08-02 19:41:40 -07:00
hooks.py	everything: Improve logging	2015-07-05 13:44:48 -07:00
relay.py	Merge branch 'devel' into wip/admin-commands-loopback	2015-08-15 19:21:38 -07:00