parent: 25d7c2 | patch | commitdiff
Chris McDonough
2012-02-29 17a618c2c8d39147dd053221aa5dcf22c80ae6c2
refs
author Chris McDonough <chrism@plope.com>
Wednesday, February 29, 2012 16:02 +0100
committer Chris McDonough <chrism@plope.com>
Wednesday, February 29, 2012 16:02 +0100
commit17a618c2c8d39147dd053221aa5dcf22c80ae6c2
tree b71962cfbf1ea7106bb5d93fc4b0a8e634fa7e2b tree | zip | gz
parent 25d7c28c6830d7f55b206b0467cd987e77f07515 view | diff
28c3135c6dab669bc4bace40cd7f8f22c0a8f997 view | diff 
Merge branch 'master' into 1.3-branch
12 files modified
164 ■■■■■ changed files
CHANGES.txt 7 ●●●●● diff | view | raw | blame | history
pyramid/compat.py 6 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 17 ●●●●● diff | view | raw | blame | history
pyramid/scripts/pserve.py 5 ●●●●● diff | view | raw | blame | history
pyramid/tests/fixtures/static/index.html 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_assets.py 29 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_integration.py 32 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_paster.py 14 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scaffolds/test_copydir.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_common.py 8 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_pserve.py 28 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_url.py 12 ●●●●● diff | view | raw | blame | history