James Lu e3079f82b2 Merge remote-tracking branch 'upstream/testing' into channel/autorejoin-delay ...

Conflicts:
	plugins/Channel/config.py

2015-02-27 23:37:11 -08:00

..

locales

Squashed commit of the following:

2014-12-20 14:37:27 +01:00

__init__.py

Channel: Correct specification of "#channel,op" capability.

2010-08-31 19:00:28 -04:00

config.py

Merge remote-tracking branch 'upstream/testing' into channel/autorejoin-delay

2015-02-27 23:37:11 -08:00

messages.pot

Squashed commit of the following:

2014-12-20 14:37:27 +01:00

plugin.py

Merge remote-tracking branch 'upstream/testing' into channel/autorejoin-delay

2015-02-27 23:37:11 -08:00

test.py

Move 'part' command from Admin to Channel and require #channel,op instead of admin

2015-02-27 18:12:52 -08:00