summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-15 21:08:27 -0500
committerChris McDonough <chrism@plope.com>2011-01-15 21:08:27 -0500
commit492368086ad82ed16aa99a271cca772a106c3f36 (patch)
tree160aa179d8ef552dd1ff1b57cf136b12f29250ff /docs/api
parentfe847fad6768c9a7f2cb1b61d88164a370f6b2db (diff)
parent035d033169f48d8250afafedd0a078d3e4f62922 (diff)
downloadpyramid-492368086ad82ed16aa99a271cca772a106c3f36.tar.gz
pyramid-492368086ad82ed16aa99a271cca772a106c3f36.tar.bz2
pyramid-492368086ad82ed16aa99a271cca772a106c3f36.zip
Merge branch 'config_extend' of git://github.com/gawel/pyramid into gawel-config_extend
Diffstat (limited to 'docs/api')
0 files changed, 0 insertions, 0 deletions