Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'progval/testing' into testing

This commit is contained in:
Mika Suomalainen 2011-08-18 14:39:32 +03:00
parent c63eefbb0d cebf67fe89
commit 679b8f21ea
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/Time/plugin.py
View File

@ -175,6 +175,7 @@ class Time(callbacks.Plugin):
timezone = pytz.timezone(timezone) timezone = pytz.timezone(timezone)
except pytz.UnknownTimeZoneError: except pytz.UnknownTimeZoneError:
irc.error(_('Unknown timezone')) irc.error(_('Unknown timezone'))
return
irc.reply(str(datetime.now(timezone))) irc.reply(str(datetime.now(timezone)))
tztime = wrap(tztime, ['text']) tztime = wrap(tztime, ['text'])

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-08-16T13:22:23+0200)' version = '0.83.4.1+limnoria (2011-08-18T11:07:25+0200)'