parent: 3c05fb | patch | commitdiff
Chris McDonough
2012-09-22 f55cec52d3a2a64345ac2bce30c26ab274c8baea
refs
author Chris McDonough <chrism@plope.com>
Saturday, September 22, 2012 16:04 +0200
committer Chris McDonough <chrism@plope.com>
Saturday, September 22, 2012 16:04 +0200
commitf55cec52d3a2a64345ac2bce30c26ab274c8baea
tree 6acc79ac91fc1cad787e70b73bca0e75da072d8e tree | zip | gz
parent 3c05fb076c617fa0c8820344135cfe9e028400a8 view | diff
098599b497fb6cd7c9372ceb795e9e8a416d573e view | diff 
Merge branch '1.4-branch'
10 files modified
83 ■■■■■ changed files
CHANGES.txt 9 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 8 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 28 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/__init__.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/__init__.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/__init__.py 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/__init__.py 6 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/__init__.py 6 ●●●●● diff | view | raw | blame | history