summaryrefslogtreecommitdiff
path: root/COPYRIGHT.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-04-15 09:51:18 -0400
committerChris McDonough <chrism@plope.com>2015-04-15 09:51:18 -0400
commit59a64567f7d123c10ed7674de0643e4b88c5b138 (patch)
treeb10a40c63c8903a300751c2e2bcf8b64ffaaf068 /COPYRIGHT.txt
parent9295929fc84008cdadd1c1625bedfe8384fbd044 (diff)
parent4d83ea47111a6661f0f7af7c2de8b85773df75d0 (diff)
downloadpyramid-59a64567f7d123c10ed7674de0643e4b88c5b138.tar.gz
pyramid-59a64567f7d123c10ed7674de0643e4b88c5b138.tar.bz2
pyramid-59a64567f7d123c10ed7674de0643e4b88c5b138.zip
Merge branch '1.6-branch'
Diffstat (limited to 'COPYRIGHT.txt')
0 files changed, 0 insertions, 0 deletions