summaryrefslogtreecommitdiff
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-05-16 22:21:32 -0400
committerDonald Stufft <donald@stufft.io>2014-05-16 22:21:32 -0400
commit81f21f2261d422d243f66b2dfeef0faae72ab119 (patch)
tree564425afe21fd919eadebce74fb8e35ba765392e /LICENSE.txt
parent6c71953b543cd15e611b2cc05178902e0e4afe42 (diff)
parent52ffb9f9ea88596e7a7953eaf04eaed681bf19cf (diff)
downloadpip-81f21f2261d422d243f66b2dfeef0faae72ab119.tar.gz
Merge branch '1.5.X'1.5.6
Conflicts: CHANGES.txt
Diffstat (limited to 'LICENSE.txt')
0 files changed, 0 insertions, 0 deletions