summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-04-14 21:53:56 -0400
committerChris McDonough <chrism@plope.com>2015-04-14 21:53:56 -0400
commit4d83ea47111a6661f0f7af7c2de8b85773df75d0 (patch)
treeb10a40c63c8903a300751c2e2bcf8b64ffaaf068 /README.rst
parent454e4380432f5607e5f365450e29d2cbd92bf68e (diff)
parent9295929fc84008cdadd1c1625bedfe8384fbd044 (diff)
downloadpyramid-4d83ea47111a6661f0f7af7c2de8b85773df75d0.tar.gz
pyramid-4d83ea47111a6661f0f7af7c2de8b85773df75d0.tar.bz2
pyramid-4d83ea47111a6661f0f7af7c2de8b85773df75d0.zip
Merge branch 'master' into 1.6-branch
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions