summaryrefslogtreecommitdiff
path: root/HACKING.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-04-15 11:39:36 -0400
committerChris McDonough <chrism@plope.com>2015-04-15 11:39:36 -0400
commit50906f073be6c619dfd9a2062a444ff53a87d018 (patch)
treea149ee7e34866cf3a6ef1eeb1e59d000bf386228 /HACKING.txt
parent77097cbdf859d0b86a002538f80ca1314f51562b (diff)
parentfa16cb17480543f027bd5316edd3d4878513e5f7 (diff)
downloadpyramid-50906f073be6c619dfd9a2062a444ff53a87d018.tar.gz
pyramid-50906f073be6c619dfd9a2062a444ff53a87d018.tar.bz2
pyramid-50906f073be6c619dfd9a2062a444ff53a87d018.zip
Merge branch '1.6-branch'
Diffstat (limited to 'HACKING.txt')
0 files changed, 0 insertions, 0 deletions