parent: f2681a | patch | commitdiff
Chris McDonough
2011-01-16 2c4cd00d071d53efc560fb38f63d7db4a162e13b
refs
author Chris McDonough <chrism@plope.com>
Sunday, January 16, 2011 01:08 +0100
committer Chris McDonough <chrism@plope.com>
Sunday, January 16, 2011 01:08 +0100
commit2c4cd00d071d53efc560fb38f63d7db4a162e13b
tree d9aed9f00f4a11ececd692f71daca9f20b5239fb tree | zip | gz
parent f2681ae753b9cc94f88b4cf47fa44714ff20216a view | diff
3d0d55e3f04810f4da83f4b794eb30f605f86d0e view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
24 files modified
767 ■■■■■ changed files
CHANGES.txt 6 ●●●●● diff | view | raw | blame | history
CONTRIBUTORS.txt 4 ●●●●● diff | view | raw | blame | history
docs/narr/project.rst 5 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/authorization.rst 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/definingviews.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/edit.pt 41 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/login.pt 37 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/templates/view.pt 34 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/authorization/tutorial/views.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/basiclayout/tutorial/views.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/edit.pt 39 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/templates/view.pt 32 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/views/tutorial/views.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/authorization.rst 351 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/definingviews.rst 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/edit.pt 41 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/login.pt 37 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/authorization/tutorial/templates/view.pt 34 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/basiclayout/tutorial/models.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/models/tutorial/models.py 3 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/edit.pt 39 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/templates/view.pt 32 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_urldispatch.py 11 ●●●●● diff | view | raw | blame | history
pyramid/urldispatch.py 3 ●●●●● diff | view | raw | blame | history