Michael Merickel
2013-07-15 b6d007065132ad313a0777eb89a71b6fbdc4bcdf
refs
author Michael Merickel <michael@merickel.org>
Monday, July 15, 2013 05:22 +0200
committer Michael Merickel <michael@merickel.org>
Monday, July 15, 2013 05:22 +0200
commitb6d007065132ad313a0777eb89a71b6fbdc4bcdf
tree c4d739f9b5fab1d39df1460b34d1317c1c26f611 tree | zip | gz
parent 17a2b9fb88f066d51c57d73ceb36b1a242bc4180 view | diff
6b97003b5cfc8e318eb0cb789569d3604b3821f3 view | diff
Merge branch 'pull.1004'
4 files modified
15 ■■■■ changed files
CHANGES.txt 3 ●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
pyramid/router.py 2 ●●● diff | view | raw | blame | history
pyramid/tests/test_router.py 8 ●●●●● diff | view | raw | blame | history