diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:55:49 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:55:49 -0700 |
| commit | f3f543b31e0c6788b26d1f450db5e9642b31ee57 (patch) | |
| tree | cccb5c76d6a3554019d6f2719506e75562c90d03 | |
| parent | 4b7ec4a32ac15dfa35b3282793a8317cfd32837b (diff) | |
| parent | 0fea4262ea396a81926cebc2be39afdbb7129396 (diff) | |
| download | slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.gz slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.bz2 slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.xz slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | sleekxmpp/version.py | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github ``develop`` branch. **Latest Release** - - `1.1.10 <http://github.com/fritzy/SleekXMPP/zipball/1.1.10>`_ + - `1.1.11 <http://github.com/fritzy/SleekXMPP/zipball/1.1.11>`_ **Develop Releases** - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_ diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index 010f425b..8f83adb3 100644 --- a/sleekxmpp/version.py +++ b/sleekxmpp/version.py @@ -9,5 +9,5 @@ # We don't want to have to import the entire library # just to get the version info for setup.py -__version__ = '1.1.10' -__version_info__ = (1, 1, 10, '', 0) +__version__ = '1.1.11' +__version_info__ = (1, 1, 11, '', 0) |