summaryrefslogtreecommitdiff
path: root/sleekxmpp/version.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-20 23:46:13 -0700
committerLance Stout <lancestout@gmail.com>2012-06-20 23:46:13 -0700
commiteb5df1aa3722e6e85b9683805b4088f4340918aa (patch)
treeb2d0989f71dc0be91d22c3221b4be5d1918e1881 /sleekxmpp/version.py
parent546066d67713db06400f4c74814875d47d98670e (diff)
parent8a745c5e8101ee80fff88cf93e969fec5507ba2d (diff)
downloadslixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.tar.gz
slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.tar.bz2
slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.tar.xz
slixmpp-eb5df1aa3722e6e85b9683805b4088f4340918aa.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/version.py')
-rw-r--r--sleekxmpp/version.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py
index 1c8737ee..782a8560 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.6'
-__version_info__ = (1, 1, 6, '', 0)
+__version__ = '1.1.7'
+__version_info__ = (1, 1, 7, '', 0)