Merge branch 'release/v0.5.7' into develop

doraemonext · Apr 8, 2015 · 00fa66b · 00fa66b
2 parents db7eb48 + a684727
commit 00fa66b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -3,4 +3,5 @@ Ace Kwok / @doraemonext
 @zxygentoo
 @JohnnyZhao
 @svcvit
-@mtunique
+@mtunique
+@lvxudong
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 微信公众平台 Python 开发包
 ===========================
 
-当前最新版本：v0.5.6
+当前最新版本：v0.5.7
 
 非官方微信公众平台 Python 开发包，包括官方接口和非官方接口。
 
@@ -59,6 +59,12 @@
 ChangeLog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+v0.5.7
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* 修复创建二维码时的传参Bug (感谢 `lvxudong <https://github.com/lvxudong>`_)
+* 创建菜单时的 menu_data 可自由使用 str 或 unicode
+
 v0.5.6
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.5.6'
+version = '0.5.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.6'
+release = '0.5.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='wechat-sdk',
-    version='0.5.6',
+    version='0.5.7',
     keywords=('wechat', 'sdk', 'wechat sdk'),
     description=u'微信公众平台Python开发包',
     long_description=open("README.rst").read(),