parent: fa4f48 | patch | commitdiff
Chris McDonough
2012-12-07 aa209726bab07b90d0e44c07a581ed51801faa8c
refs
author Chris McDonough <chrism@plope.com>
Friday, December 7, 2012 04:47 +0100
committer Chris McDonough <chrism@plope.com>
Friday, December 7, 2012 04:47 +0100
commitaa209726bab07b90d0e44c07a581ed51801faa8c
tree 229eaf700c204cb98d0e49be5b5280772b0fed2d tree | zip | gz
parent fa4f48ee9ef697cbdff9337da0cdf12d761402fb view | diff
8623289291f435c34ca0126250829ead791aca7e view | diff 
Merge branch '1.4-branch' of github.com:Pylons/pyramid into 1.4-branch
3 files modified
32 ■■■■■ changed files
CHANGES.txt 12 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_view.py 2 ●●●●● diff | view | raw | blame | history
pyramid/view.py 18 ●●●●● diff | view | raw | blame | history