]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
projects / thirdparty / tornado.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94198fa 86c2bf8)
Merge remote-tracking branch 'wolever/fix-staticfile-serving' into merge
authorBen Darnell <ben@bendarnell.com>
Sat, 25 May 2013 21:51:46 +0000 (17:51 -0400)
committerBen Darnell <ben@bendarnell.com>
Sat, 25 May 2013 21:51:46 +0000 (17:51 -0400)
Conflicts:
tornado/test/web_test.py

1  2 
tornado/test/web_test.py patch | diff1 | diff2 | blob | history

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