parent: 64497e | patch | commitdiff
Michael Merickel
2012-01-05 a1751e1a522e331301955c7b540b26d988b51e64
refs
author Michael Merickel <michael@merickel.org>
Thursday, January 5, 2012 10:47 +0100
committer Michael Merickel <michael@merickel.org>
Thursday, January 5, 2012 10:47 +0100
commita1751e1a522e331301955c7b540b26d988b51e64
tree 300a7e63c438308eeea92deecf71423e8978877e tree | zip | gz
parent 64497edc64a153815c54b254bf64a46ac21a6ac7 view | diff
4ded431cba6729e5f2ac1879df735905006555ac view | diff 
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
10 files modified
36 ■■■■■ changed files
docs/copyright.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 6 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/basiclayout.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/tests/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/setup.py 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/tests.rst 2 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/setup.py_tmpl 4 ●●●●● diff | view | raw | blame | history