]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6729952 b18b12b)
Merge branch 'branch4.0'
authorBen Darnell <ben@bendarnell.com>
Mon, 15 Sep 2014 02:02:27 +0000 (22:02 -0400)
committerBen Darnell <ben@bendarnell.com>
Mon, 15 Sep 2014 02:02:27 +0000 (22:02 -0400)
Conflicts:
docs/releases.rst
setup.py
tornado/__init__.py

1  2 
docs/releases.rst patch | diff1 | diff2 | blob | history

diff --cc docs/releases.rst
index 30d1170dd2cd9bdff8658623cad7f6bc8e1a2519,e2ca2147fd24b6c946f8c51bda54dd17d90c50ad..ad2804d6320bef72ff9c56def814dcabe859120b
--- 1/docs/releases.rst
--- 2/docs/releases.rst
+++ b/docs/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v4.0.2
     releases/v4.0.1
     releases/v4.0.0
     releases/v3.2.2
Mirror of https://github.com/tornadoweb/tornado.git