]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95c2ff8 7ce6484)
Merge branch 'branch2.4'
authorBen Darnell <ben@bendarnell.com>
Sun, 10 Mar 2013 20:00:58 +0000 (16:00 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 10 Mar 2013 20:00:58 +0000 (16:00 -0400)
1  2 
website/sphinx/conf.py patch | diff1 | diff2 | blob | history

diff --cc website/sphinx/conf.py
Simple merge
Mirror of https://github.com/tornadoweb/tornado.git