parent: 571f1b | patch | commitdiff
Chris McDonough
2012-10-05 9811b08518c594c24fddf86dba8f5956117fa89b
refs
author Chris McDonough <chrism@plope.com>
Friday, October 5, 2012 20:24 +0200
committer Chris McDonough <chrism@plope.com>
Friday, October 5, 2012 20:24 +0200
commit9811b08518c594c24fddf86dba8f5956117fa89b
tree d8b2477e5ef5d980692e01cebf15875aae8d88be tree | zip | gz
parent 571f1b6836bec084feec70ccf1e0fb8ced0af317 view | diff
fa587efc26c285cdc7e23990f947fdbd233ab53a view | diff 
Merge branch 'fix.templatemacroreg'
5 files modified
85 ■■■■■ changed files
pyramid/renderers.py 31 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 37 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/withmacro.pt 1 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_zpt.py 9 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 7 ●●●●● diff | view | raw | blame | history