parent: 3ffd40 | patch | commitdiff
Michael Merickel
2014-11-17 405be483f50c37edef694e81aadcaa326311e51d
refs
author Michael Merickel <michael@merickel.org>
Monday, November 17, 2014 08:27 +0100
committer Michael Merickel <michael@merickel.org>
Monday, November 17, 2014 08:27 +0100
commit405be483f50c37edef694e81aadcaa326311e51d
tree 3f34467bd232d0dd1da6fe4e2cf6c225fbbbe08d tree | zip | gz
parent 3ffd40c295a1e37ec94b6123fff8fb4dd5f5abf5 view | diff
af0290407b50a18664c9ae28a4c01d4cfb27920b view | diff 
Merge branch 'master' into feature.security-docs-enhancements
10 files modified
273 ■■■■■ changed files
CHANGES.txt 18 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
docs/api/exceptions.rst 12 ●●●●● diff | view | raw | blame | history
docs/api/httpexceptions.rst 94 ●●●●● diff | view | raw | blame | history
docs/narr/i18n.rst 2 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 21 ●●●●● diff | view | raw | blame | history
pyramid/scripts/proutes.py 66 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 37 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_response.py 11 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_proutes.py 10 ●●●●● diff | view | raw | blame | history