parent: dd08cc | patch | commitdiff
Chris McDonough
2012-03-20 676131b34addf444f58a3dec011dd5f05329b0cf
refs
author Chris McDonough <chrism@plope.com>
Tuesday, March 20, 2012 05:35 +0100
committer Chris McDonough <chrism@plope.com>
Tuesday, March 20, 2012 05:35 +0100
commit676131b34addf444f58a3dec011dd5f05329b0cf
tree e618bf0f4aaf7e1dc35b74f851160b8c9b64079c tree | zip | gz
parent dd08cceff6c650f211c4e3fd3c7c73e37616ea7c view | diff
6c15971a0006ed944e19a8f93b5897dccda028c0 view | diff 
Merge branch '1.3-branch'
4 files modified
51 ■■■■■ changed files
CHANGES.txt 5 ●●●●● diff | view | raw | blame | history
pyramid/compat.py 7 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 27 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 12 ●●●●● diff | view | raw | blame | history