summaryrefslogtreecommitdiffhomepage
path: root/requirements.txt
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-04-27 22:15:07 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-04-27 22:15:07 -0700
commita1fa1ba9cc2cf6cc65ffebb629da30333de84058 (patch)
tree086bd587277661ab5c9d9c1824d0ba4b246c3096 /requirements.txt
parentf861c2ff48f420b3be16f15bbf36c6ee3f779c38 (diff)
parent3966ac103c988218be02371803817b66b4deab17 (diff)
Merge branch '1.10'
Conflicts: NEWS
Diffstat (limited to 'requirements.txt')
0 files changed, 0 insertions, 0 deletions