Chris McDonough
2013-05-10 dbdfb2fea3851e31e272ebbba4297a138d74e970
refs
author Chris McDonough <chrism@plope.com>
Friday, May 10, 2013 01:45 +0200
committer Chris McDonough <chrism@plope.com>
Friday, May 10, 2013 01:45 +0200
commitdbdfb2fea3851e31e272ebbba4297a138d74e970
tree e4843670bbf5a681b398a5bfb4bd36fd5a1f22f4 tree | zip | gz
parent 100024533b6bf297228ffccf7230fcaad136edb9 view | diff
a0f84bd416be91b7e861d3b5ba8aa7468ad3c4be view | diff
Merge branch 'master' of github.com:Pylons/pyramid
5 files modified
9 ■■■■■ changed files
.gitignore 2 ●●● diff | view | raw | blame | history
CHANGES.txt 1 ●●●● diff | view | raw | blame | history
docs/conf.py 2 ●●● diff | view | raw | blame | history
docs/glossary.rst 2 ●●● diff | view | raw | blame | history
docs/tutorials/wiki/src/models/tutorial/tests.py 2 ●●● diff | view | raw | blame | history