pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Lance Stout 2012-10-31 13:55:49 -07:00
commit f3f543b31e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -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>`_

4
sleekxmpp/version.py
View file

@ -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)