parent: 3e9a73 | patch | commitdiff
Chris McDonough
2016-06-03 88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e
refs
author Chris McDonough <chrism@plope.com>
Friday, June 3, 2016 03:17 +0200
committer Chris McDonough <chrism@plope.com>
Friday, June 3, 2016 03:17 +0200
commit88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e
tree 187d1e54a5c0054b3670ab4b11dd09893cd5474f tree | zip | gz
parent 3e9a737500e79a6a919ce53db9557c75d874b84c view | diff
03301637f1069a084e539b04944eb45eec59628e view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
6 files modified
637 ■■■■■ changed files
CHANGES.txt 10 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 4 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 4 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/__init__.py 16 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 408 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pserve.py 195 ●●●●● diff | view | raw | blame | history