summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-11-04 13:25:32 -0600
committerMichael Merickel <michael@merickel.org>2018-11-04 13:25:32 -0600
commit44e7e63ac1f95d52bdd25c22c36efd820c059e35 (patch)
treee6062558dd3c5a4716f9cd521059f1621bc76457 /docs/glossary.rst
parent6f0d73d6eea8064f1c5d9294beb7f7d64619071d (diff)
parentde5e4f40e0246d71ba5875c957281fb764da74dd (diff)
downloadpyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.tar.gz
pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.tar.bz2
pyramid-44e7e63ac1f95d52bdd25c22c36efd820c059e35.zip
Merge branch 'pr/1639' into bare-route-prefix
Diffstat (limited to 'docs/glossary.rst')
0 files changed, 0 insertions, 0 deletions