parent: 2ae6f2 | patch | commitdiff
Chris McDonough
2013-04-23 47b8cf7e9b578464b533383083f7135271db0f9e
refs
author Chris McDonough <chrism@plope.com>
Tuesday, April 23, 2013 18:10 +0200
committer Chris McDonough <chrism@plope.com>
Tuesday, April 23, 2013 18:10 +0200
commit47b8cf7e9b578464b533383083f7135271db0f9e
tree 724c40d50f21773b6585ab7d9731b8bf7a93a71c tree | zip | gz
parent 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb view | diff
dcaabcb87ca584c289efe70a604db0502838df3d view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
30 files modified
201 ■■■■■ changed files
CHANGES.txt 10 ●●●●● diff | view | raw | blame | history
docs/api/request.rst 8 ●●●●● diff | view | raw | blame | history
docs/conf.py 4 ●●●●● diff | view | raw | blame | history
docs/designdefense.rst 10 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/advconfig.rst 10 ●●●●● diff | view | raw | blame | history
docs/narr/assets.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/environment.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/extconfig.rst 4 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 36 ●●●●● diff | view | raw | blame | history
docs/narr/renderers.rst 23 ●●●●● diff | view | raw | blame | history
docs/narr/resources.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/scaffolding.rst 12 ●●●●● diff | view | raw | blame | history
docs/narr/security.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/subrequest.rst 8 ●●●●● diff | view | raw | blame | history
docs/narr/testing.rst 10 ●●●●● diff | view | raw | blame | history
docs/narr/threadlocals.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 7 ●●●●● diff | view | raw | blame | history
docs/narr/webob.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/zca.rst 7 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/adapters.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 5 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 4 ●●●●● diff | view | raw | blame | history
pyramid/request.py 3 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/__init__.py 4 ●●●●● diff | view | raw | blame | history
pyramid/testing.py 9 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 3 ●●●●● diff | view | raw | blame | history
pyramid/view.py 2 ●●●●● diff | view | raw | blame | history
pyramid/wsgi.py 2 ●●●●● diff | view | raw | blame | history