parent: 330164 | patch | commitdiff
Chris McDonough
2013-08-30 8c5ccaf633240b397a1a6d18c02d6c6fce26b8c9
refs
author Chris McDonough <chrism@plope.com>
Friday, August 30, 2013 06:01 +0200
committer Chris McDonough <chrism@plope.com>
Friday, August 30, 2013 06:01 +0200
commit8c5ccaf633240b397a1a6d18c02d6c6fce26b8c9
tree 7826c387f61d17513162b1e47ee1e19723a1cc6a tree | zip | gz
parent 330164c3190d92a3e1df89baafba12570d03bd32 view | diff
c29603ed0d8fd0b55789eb8f975c901961864d66 view | diff 
Merge branch 'feature.hybridurlgen'
9 files modified
421 ■■■■■ changed files
CHANGES.txt 19 ●●●●● diff | view | raw | blame | history
docs/narr/hybrid.rst 102 ●●●●● diff | view | raw | blame | history
pyramid/interfaces.py 15 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_request.py 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_traversal.py 27 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_url.py 152 ●●●●● diff | view | raw | blame | history
pyramid/traversal.py 16 ●●●●● diff | view | raw | blame | history
pyramid/url.py 87 ●●●●● diff | view | raw | blame | history
pyramid/urldispatch.py 2 ●●●●● diff | view | raw | blame | history