parent: a5cbfc | patch | commitdiff
zrayn
2016-06-03 3216188e967d8dd4d9770ee45d9750f109d15ff6
refs
author zrayn <zshooter@gmail.com>
Friday, June 3, 2016 01:43 +0200
committer zrayn <zshooter@gmail.com>
Friday, June 3, 2016 01:43 +0200
commit3216188e967d8dd4d9770ee45d9750f109d15ff6
tree 880ffc3184a98bae1631f1ee426e9d09c0054eab tree | zip | gz
parent a5cbfca0f0567db8c00fe401dcfb895ab9860710 view | diff
281a670eefe741627a4523ed5acb74da9c5180b3 view | diff 
Merge branch 'master' into stip_pserve_daemon_support
2 files modified
6 ■■■■■ changed files
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 4 ●●●●● diff | view | raw | blame | history