RedHatTraining/pyramid.git

Chris McDonough

2012-09-01 a7eba78fdb75e85b136b8b13add98c61f16a3790

refs
author	Chris McDonough <chrism@plope.com>
	Saturday, September 1, 2012 09:17 +0200
committer	Chris McDonough <chrism@plope.com>
	Saturday, September 1, 2012 09:17 +0200
commit	a7eba78fdb75e85b136b8b13add98c61f16a3790
tree	8c49cd4180ab15f792aab8f507bd2b230771bb4c tree \| zip \| gz
parent	a9289d95036eb23e973815e529d3db3fea235046 view \| diff 9e99e37432fe494b21c1aa7c4b381ece5c9b2727 view \| diff

Merge branch 'master' of github.com:Pylons/pyramid

1 files added

8 files modified

	CHANGES.txt	19 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/renderers.rst	4 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/templates.rst	45 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/testing.rst	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/chameleon_text.py	2 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/chameleon_zpt.py	17 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/renderers.py	13 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/fixtures/withmacro.pt	3 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_renderers.py	27 ●●●●● diff \| view \| raw \| blame \| history