summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-12 09:23:20 +0100
committerMichael Vogt <mvo@debian.org>2014-02-12 09:23:20 +0100
commit183d522362c95309d70baa418b54096599c17653 (patch)
tree9f0c12dc542c3ec627d7cc384ec55838ae9e63fc /.travis.yml
parentce55512d4924b52c985276c62a0c69ac13e203cd (diff)
parent8f3594c3487800edc2a97af1f3290049776dc556 (diff)
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Conflicts: test/integration/test-apt-get-download
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions