Chris McDonough
2013-09-22 b83f6c8be631780f159068066dd95c4b29828622
refs
author Chris McDonough <chrism@plope.com>
Sunday, September 22, 2013 19:54 +0200
committer Chris McDonough <chrism@plope.com>
Sunday, September 22, 2013 19:54 +0200
commitb83f6c8be631780f159068066dd95c4b29828622
tree 9fe4e5eb89bd5e552704233e9daeedfc12a5344d tree | zip | gz
parent faf334d94e8c7450962b6b0d18fe57cefd43f04a view | diff
0778eeab0d758deba3876db9026536863218bda8 view | diff
Merge branch 'master' into 1.5-branch
5 files modified
396 ■■■■■ changed files
CHANGES.txt 126 ●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 2 ●●● diff | view | raw | blame | history
docs/whatsnew-1.5.rst 204 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 22 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 42 ●●●●● diff | view | raw | blame | history