diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-20 21:13:06 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-20 21:13:06 -0700 |
| commit | 546066d67713db06400f4c74814875d47d98670e (patch) | |
| tree | f187cb39a9f6d015b93e47c0d2bb711089217cb8 | |
| parent | 32345969742042aeb92f7b1d06c7ccde1ce12209 (diff) | |
| parent | 7a112f25237fcae3a99d327f56d4e01a94fd6e86 (diff) | |
| download | slixmpp-546066d67713db06400f4c74814875d47d98670e.tar.gz slixmpp-546066d67713db06400f4c74814875d47d98670e.tar.bz2 slixmpp-546066d67713db06400f4c74814875d47d98670e.tar.xz slixmpp-546066d67713db06400f4c74814875d47d98670e.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.5 <http://github.com/fritzy/SleekXMPP/zipball/1.1.5>`_ + - `1.1.6 <http://github.com/fritzy/SleekXMPP/zipball/1.1.6>`_ **Develop Releases** - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_ diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index 7970c3b5..1c8737ee 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.5' -__version_info__ = (1, 1, 5, '', 0) +__version__ = '1.1.6' +__version_info__ = (1, 1, 6, '', 0) |