parent: 96ab9f | patch | commitdiff
Chris McDonough
2013-01-02 1a19bf74afc768db45c77604c2cd33cc26af34c1
refs
author Chris McDonough <chrism@plope.com>
Wednesday, January 2, 2013 03:05 +0100
committer Chris McDonough <chrism@plope.com>
Wednesday, January 2, 2013 03:05 +0100
commit1a19bf74afc768db45c77604c2cd33cc26af34c1
tree ce6cfba28f4ad75a89e34f51c3ba363e34e873a4 tree | zip | gz
parent 96ab9f26990423f67045e5639a29579a1a76a71e view | diff
e0062294430dd1d30d31b9f8c0a2e6e9060bcb76 view | diff 
Merge branch 'master' of github.com:Pylons/pyramid
8 files modified
20 ■■■■■ changed files
docs/api/registry.rst 4 ●●●●● diff | view | raw | blame | history
docs/make_book 2 ●●●●● diff | view | raw | blame | history
docs/make_epub 2 ●●●●● diff | view | raw | blame | history
docs/make_pdf 2 ●●●●● diff | view | raw | blame | history
docs/narr/firstapp.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/urldispatch.rst 2 ●●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/design.rst 4 ●●●●● diff | view | raw | blame | history