parent: 4018ad | patch | commitdiff
Ben Bangert
2010-11-19 41181f28409b49a15dc907b11b90c3c0f8e9275c
refs
author Ben Bangert <ben@groovie.org>
Friday, November 19, 2010 05:38 +0100
committer Ben Bangert <ben@groovie.org>
Friday, November 19, 2010 05:38 +0100
commit41181f28409b49a15dc907b11b90c3c0f8e9275c
tree 87136ba39d045b8dc1403d76e3e8ae184fee6888 tree | zip | gz
parent 4018adea20ee73cfeeaebb69e95e4b00dd5cf22e view | diff
29b7aabcb7b50024ead27cb5ff9cb47757ffe462 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
7 files modified
100 ■■■■■ changed files
CHANGES.txt 2 ●●●●● diff | view | raw | blame | history
pyramid/configuration.py 19 ●●●●● diff | view | raw | blame | history
pyramid/testing.py 7 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_text.py 30 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_chameleon_zpt.py 30 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_configuration.py 10 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 2 ●●●●● diff | view | raw | blame | history