Chris McDonough
2013-01-04 2b164460337dd655f9aebb25a10e6f0f35363656
refs
author Chris McDonough <chrism@plope.com>
Friday, January 4, 2013 19:01 +0100
committer Chris McDonough <chrism@plope.com>
Friday, January 4, 2013 19:01 +0100
commit2b164460337dd655f9aebb25a10e6f0f35363656
tree 8176f796f0fa0bbb33a9d1c07b0be0b8834c6a50 tree | zip | gz
parent cf7c15a6ceb0b96a7950daef2a33ee2464c655cb view | diff
70a45c70e76dd958d7c8fb23b2bc2fe93d067a05 view | diff
Merge branch 'master' of github.com:Pylons/pyramid
3 files modified
130 ■■■■■ changed files
docs/conf.py 2 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/installation.rst 93 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki2/installation.rst 35 ●●●● diff | view | raw | blame | history