parent: 0b92df | patch | commitdiff
Steve Piercy
2017-05-12 dede5366e8b2ce5982806f4306cdaaa6c8e178ca
refs
author Steve Piercy <web@stevepiercy.com>
Friday, May 12, 2017 10:27 +0200
committer Steve Piercy <web@stevepiercy.com>
Friday, May 12, 2017 10:27 +0200
commitdede5366e8b2ce5982806f4306cdaaa6c8e178ca
tree 5a9d27d5f518d1abc5e89c5a5a00b6d409781671 tree | zip | gz
parent 0b92dfed800117595ef00fb2847c5db9970f4cac view | diff
4e27dd4c452a67d38a07eb79939dcbfcc6e82ab0 view | diff 
Merge remote-tracking branch 'upstream/master'
7 files modified
147 ■■■■■ changed files
CHANGES.txt 42 ●●●●● diff | view | raw | blame | history
docs/conf.py 2 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.9.rst 9 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_view.py 6 ●●●●● diff | view | raw | blame | history
pyramid/tweens.py 60 ●●●●● diff | view | raw | blame | history
pyramid/view.py 26 ●●●●● diff | view | raw | blame | history
setup.py 2 ●●●●● diff | view | raw | blame | history