parent: 83a400 | patch | commitdiff
John Anderson
2015-01-06 ae7bcd7cabc53e0b500c6a79f30606e67217ad1d
refs
author John Anderson <sontek@gmail.com>
Tuesday, January 6, 2015 08:46 +0100
committer John Anderson <sontek@gmail.com>
Tuesday, January 6, 2015 08:46 +0100
commitae7bcd7cabc53e0b500c6a79f30606e67217ad1d
tree 7c33b2a6244d03df275f4cce83f4f3f1f77c94bf tree | zip | gz
parent 83a400a3cd121fe65d33e796c28a199b35ab67e5 view | diff
2d659e41d01926acaa8670c4d20be20300bcedb7 view | diff 
Merge branch 'master' of https://github.com/Pylons/pyramid into support_more_features_in_routes

Conflicts:
	CHANGES.txt
3 files modified
33 ■■■■■ changed files
CHANGES.txt 4 ●●●●● diff | view | raw | blame | history
pyramid/renderers.py 4 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_renderers.py 25 ●●●●● diff | view | raw | blame | history