Merge remote-tracking branch 'origin/master'

邓丹 · 邓丹 · commit 2f46d6952ecf · 2017-11-20T12:31:05.000+08:00
# Conflicts:
#	docs/source/conf.py
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -52,9 +52,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.6.0'
+version = '3.6.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.6.0'
+release = '3.6.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
