parent: b33a6a | patch | commitdiff
Chris McDonough
2012-10-14 a187ea92eda80aebedf8d2d3c41fbbeda11a9471
refs
author Chris McDonough <chrism@plope.com>
Sunday, October 14, 2012 01:02 +0200
committer Chris McDonough <chrism@plope.com>
Sunday, October 14, 2012 01:02 +0200
commita187ea92eda80aebedf8d2d3c41fbbeda11a9471
tree ad3a762fccf0d48b5300ace29b52c09298409767 tree | zip | gz
parent b33a6a79fe614bd50a9a6993d8538ac0e8469bc1 view | diff
dddddedc546506f6736054bd562e90a0b23def68 view | diff 
Merge branch '1.4-branch'
9 files modified
223 ■■■■■ changed files
CHANGES.txt 10 ●●●●● diff | view | raw | blame | history
docs/narr/viewconfig.rst 11 ●●●●● diff | view | raw | blame | history
docs/whatsnew-1.4.rst 10 ●●●●● diff | view | raw | blame | history
pyramid/config/predicates.py 49 ●●●●● diff | view | raw | blame | history
pyramid/config/views.py 9 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl 16 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl 16 ●●●●● diff | view | raw | blame | history
pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt 16 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config/test_predicates.py 86 ●●●●● diff | view | raw | blame | history