Chris McDonough
2015-04-03 ebb588e5b86920b00d10319e1ded681dd3109222
refs
author Chris McDonough <chrism@plope.com>
Friday, April 3, 2015 22:18 +0200
committer Chris McDonough <chrism@plope.com>
Friday, April 3, 2015 22:18 +0200
commitebb588e5b86920b00d10319e1ded681dd3109222
tree 9efe59281dbc0b20b9a94b69ee0a18bcb124aa93 tree | zip | gz
parent a7d77fdecaa120f4e095d271b687e3bb628e8696 view | diff
45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f view | diff
Merge branch 'master' of github.com:Pylons/pyramid
3 files modified
14 ■■■■■ changed files
README.rst 6 ●●●● diff | view | raw | blame | history
docs/_themes @ 382cba 2 ●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 6 ●●●● diff | view | raw | blame | history