parent: 246c13 | patch | commitdiff
Chris McDonough
2012-09-22 8c526eb6c1342a7506d83a3316e6386a3447a0b1
refs
author Chris McDonough <chrism@plope.com>
Saturday, September 22, 2012 13:58 +0200
committer Chris McDonough <chrism@plope.com>
Saturday, September 22, 2012 13:58 +0200
commit8c526eb6c1342a7506d83a3316e6386a3447a0b1
tree 67e0b52bc86521a97618949d59736165569adda1 tree | zip | gz
parent 246c13ed4366d3e3869185919ea1877fe23fe1ff view | diff
72561a213ccc456738582551e85fab0f0c8d09ab view | diff 
Merge branch 'master' into 1.4-branch
4 files modified
21 ■■■■■ changed files
TODO.txt 4 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 1 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 14 ●●●●● diff | view | raw | blame | history