parent: e84fc5 | patch | commitdiff
Michael Merickel
2013-04-01 abbc398b4544f89f8e1b1b9522a23e441e7ebedb
refs
author Michael Merickel <michael@merickel.org>
Monday, April 1, 2013 19:32 +0200
committer Michael Merickel <michael@merickel.org>
Monday, April 1, 2013 19:32 +0200
commitabbc398b4544f89f8e1b1b9522a23e441e7ebedb
tree 36b699f5dd70baa42d8587760d9e51329aeaf29f tree | zip | gz
parent e84fc5f12864bfb1f5314a59e547ce94ba75ea13 view | diff
39695d2fc53802e038ec78d1e3db09d7b1cba4ae view | diff 
Merge branch 'pull.952-backport' into 1.4-branch
1 files added
4 files modified
57 ■■■■■ changed files
CHANGES.txt 10 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 14 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/hello .world.mako 3 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 28 ●●●●● diff | view | raw | blame | history