Chris McDonough
2011-09-04 54190dd68e0307cae3d21e5f8920e9a5ea379771
refs
author Chris McDonough <chrism@plope.com>
Sunday, September 4, 2011 05:05 +0200
committer Chris McDonough <chrism@plope.com>
Sunday, September 4, 2011 05:05 +0200
commit54190dd68e0307cae3d21e5f8920e9a5ea379771
tree 07f8f0339eef3678d0432a60cd0b44c8a2e43916 tree | zip | gz
parent 3e4f6932ebee2f4680c1a16e46e4b5cc792241a2 view | diff
c2aae1f09786f1044ded7c61a83961fed87cc7d9 view | diff
merge master into branch
4 files modified
56 ■■■■ changed files
CHANGES.txt 10 ●●●●● diff | view | raw | blame | history
docs/narr/environment.rst 15 ●●●● diff | view | raw | blame | history
pyramid/config/__init__.py 21 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_init.py 10 ●●●●● diff | view | raw | blame | history