parent: 8c30a3 | patch | commitdiff
Chris McDonough
2012-11-13 c224c6ea4a50b89869a7108e775e6ee0adc9e63d
refs
author Chris McDonough <chrism@plope.com>
Tuesday, November 13, 2012 20:01 +0100
committer Chris McDonough <chrism@plope.com>
Tuesday, November 13, 2012 20:01 +0100
commitc224c6ea4a50b89869a7108e775e6ee0adc9e63d
tree f9c27de63b5113c864ceacb7f065e791eb3523e9 tree | zip | gz
parent 8c30a3d9c2437e661eac6f23315837fccb4741ea view | diff
fd77b5c78677109c7756a690d0e4be43895ae12a view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
18 files modified
280 ■■■■■ changed files
CHANGES.txt 4 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
docs/narr/hooks.rst 13 ●●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 11 ●●●●● diff | view | raw | blame | history
pyramid/config/assets.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/factories.py 8 ●●●●● diff | view | raw | blame | history
pyramid/config/i18n.py 3 ●●●●● diff | view | raw | blame | history
pyramid/config/predicates.py 9 ●●●●● diff | view | raw | blame | history
pyramid/config/rendering.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/security.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/testing.py 2 ●●●●● diff | view | raw | blame | history
pyramid/config/util.py 61 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 19 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_predicates.py 12 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_util.py 30 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_util.py 31 ●●●●● diff | view | raw | blame | history
pyramid/util.py 67 ●●●●● diff | view | raw | blame | history