Chris McDonough
2011-07-15 049e0e76ead84806d8033b3de75dd037434f7637
refs
author Chris McDonough <chrism@plope.com>
Friday, July 15, 2011 16:14 +0200
committer Chris McDonough <chrism@plope.com>
Friday, July 15, 2011 16:14 +0200
commit049e0e76ead84806d8033b3de75dd037434f7637
tree d47c6230bbab46bf83022730412296574c2893fb tree | zip | gz
parent 4edda0d6d875ee0e7bc0375e4b314d78b1261f0e view | diff
c515d77de5b2f62727251ebc32d1292e67811771 view | diff
Merge branch 'mmerickel-feature.scripting'
14 files modified
585 ■■■■ changed files
CHANGES.txt 33 ●●●●● diff | view | raw | blame | history
docs/api/config.rst 12 ●●●●● diff | view | raw | blame | history
docs/api/paster.rst 15 ●●●● diff | view | raw | blame | history
docs/api/scripting.rst 4 ●●●● diff | view | raw | blame | history
docs/narr/assets.rst 2 ●●● diff | view | raw | blame | history
docs/whatsnew-1.1.rst 39 ●●●●● diff | view | raw | blame | history
pyramid/config.py 4 ●●●● diff | view | raw | blame | history
pyramid/paster.py 94 ●●●● diff | view | raw | blame | history
pyramid/scripting.py 87 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_config.py 22 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_paster.py 41 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripting.py 110 ●●●● diff | view | raw | blame | history
pyramid/tests/test_util.py 73 ●●●●● diff | view | raw | blame | history
pyramid/util.py 49 ●●●●● diff | view | raw | blame | history