Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-23 02:24:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'supybot/master' into testing

Browse Source 
Conflicts:
	plugins/Channel/plugin.py
This commit is contained in:
Valentin Lorentz 2011-10-27 11:56:13 +02:00
commit ceabe070a0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Channel/plugin.py
View File

@ -827,8 +827,8 @@ class Channel(callbacks.Plugin):
msg.args[0] != channel and \ msg.args[0] != channel and \
(ircutils.isChannel(msg.args[0]) or \ (ircutils.isChannel(msg.args[0]) or \
msg.nick not in irc.state.channels[channel].users): msg.nick not in irc.state.channels[channel].users):
irc.error(_('You don\'t have access to that information.')) irc.error(_('You don\'t have access to that information.'),
return Raise=True)
L = list(irc.state.channels[channel].users) L = list(irc.state.channels[channel].users)
keys = [option for (option, arg) in optlist] keys = [option for (option, arg) in optlist]
if 'count' not in keys: if 'count' not in keys:

2
src/version.py
View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change """stick the various versioning attributes in here, so we only have to change
them once.""" them once."""
version = '0.83.4.1+limnoria (2011-10-27T10:47:59+0200)' version = '0.83.4.1+limnoria (2011-10-27T11:56:13+0200)'