parent: 8b55a6 | patch | commitdiff
Chris McDonough
2012-08-29 a7051f17a6f352193b4f4b7f1bcc635dff452001
refs
author Chris McDonough <chrism@plope.com>
Wednesday, August 29, 2012 22:06 +0200
committer Chris McDonough <chrism@plope.com>
Wednesday, August 29, 2012 22:06 +0200
commita7051f17a6f352193b4f4b7f1bcc635dff452001
tree 33b3a6d6994137b6423f2f4d9ac2dc1a0e3ab717 tree | zip | gz
parent 8b55a68adb54783895a91a9e1af800a7f8f22c07 view | diff
a9289d95036eb23e973815e529d3db3fea235046 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
1 files added
24 files modified
866 ■■■■■ changed files
CHANGES.txt 37 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 4 ●●●●● diff | view | raw | blame | history
TODO.txt 27 ●●●●● diff | view | raw | blame | history
docs/glossary.rst 3 ●●●●● diff | view | raw | blame | history
docs/narr/firstapp.rst 10 ●●●●● diff | view | raw | blame | history
docs/narr/helloworld.py 15 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 122 ●●●●● diff | view | raw | blame | history
docs/narr/views.rst 2 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 29 ●●●●● diff | view | raw | blame | history
pyramid/config/adapters.py 115 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 41 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 9 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 44 ●●●●● diff | view | raw | blame | history
pyramid/events.py 17 ●●●●● diff | view | raw | blame | history
pyramid/mako_templating.py 2 ●●●●● diff | view | raw | blame | history
pyramid/session.py 106 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/__init__.py 8 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_adapters.py 127 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_factories.py 6 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 26 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py:TestConfigurator_add_directive diff | view | raw | blame | history
pyramid/tests/test_config/test_views.py 43 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_events.py 21 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_mako_templating.py 10 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_session.py 42 ●●●●● diff | view | raw | blame | history