]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bb80eb 9484eb0)
Merge remote-tracking branch 'birknilson/static_url_override' into work
authorBen Darnell <ben@bendarnell.com>
Sun, 22 Jan 2012 22:25:16 +0000 (14:25 -0800)
committerBen Darnell <ben@bendarnell.com>
Sun, 22 Jan 2012 22:25:16 +0000 (14:25 -0800)
1  2 
tornado/test/web_test.py patch | diff1 | diff2 | blob | history
tornado/web.py patch | diff1 | diff2 | blob | history

diff --cc tornado/test/web_test.py
Simple merge
diff --cc tornado/web.py
Simple merge
Mirror of https://github.com/tornadoweb/tornado.git