]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Merge branch 'guide'
authorBen Darnell <ben@bendarnell.com>
Fri, 4 Jul 2014 20:04:09 +0000 (16:04 -0400)
committerBen Darnell <ben@bendarnell.com>
Fri, 4 Jul 2014 20:04:09 +0000 (16:04 -0400)
* guide:
  Expand and rewrite the guide docs.
  Split overview.rst into separate files.

1  2 
docs/web.rst
tornado/httpclient.py
tornado/web.py

diff --cc docs/web.rst
Simple merge
Simple merge
diff --cc tornado/web.py
Simple merge