parent: c6198a | patch | commitdiff
Blaise Laflamme
2010-11-04 5a48062afc72c4dc899bf9ec032ce2bc1d249448
refs
author Blaise Laflamme <blaise@laflamme.org>
Thursday, November 4, 2010 20:01 +0100
committer Blaise Laflamme <blaise@laflamme.org>
Thursday, November 4, 2010 20:01 +0100
commit5a48062afc72c4dc899bf9ec032ce2bc1d249448
tree d4826f3fe62b8be6197d414342bb43de0fbcaa79 tree | zip | gz
parent c6198aa3a05716e7a98d837600a48994d6d7b61a view | diff
ea979e868855d935b53a31bbf64e8d27a67ce63f view | diff 
Merge branch 'master' of git://github.com/Pylons/pyramid
7 files modified
130 ■■■■■ changed files
CHANGES.txt 20 ●●●●● diff | view | raw | blame | history
TODO.txt 4 ●●●●● diff | view | raw | blame | history
docs/zcml/view.rst 6 ●●●●● diff | view | raw | blame | history
pyramid/configuration.py 5 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_configuration.py 13 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_zcml.py 62 ●●●●● diff | view | raw | blame | history
pyramid/zcml.py 20 ●●●●● diff | view | raw | blame | history