summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-12-15 13:11:08 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-12-15 13:11:08 -0300
commitaff470b3efa671f6c04107f718d359054a739bdc (patch)
treeefa08835f1ff9c8d01ed93c08b614f056fd6cb4f /setup.cfg
parent43a67207845943d5e93c51844feb6666ac1911f5 (diff)
parent9e89e4fc8dba7541f3475de0183b47fa9342ea84 (diff)
Merge branch 'release/0.7.x' into develop
Conflicts: pkg/tuf/release.py relnotes.txt
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions