]> git.ipfire.org Git - thirdparty/tornado.git/commit
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)
commit9c4a59e1a484f6da9fcd73a96d0a7c204beb8296
tree30c22faa1d490288270f07e3fe65bc7959e0f1a6
parent94198facc300623e05c7eb6465794c0635ecadfa
parent86c2bf83be73e28aa9a9ab9465ad33d8d6d6a5dd
Merge remote-tracking branch 'wolever/fix-staticfile-serving' into merge

Conflicts:
tornado/test/web_test.py
tornado/test/web_test.py