summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-11 14:40:08 +0200
committerMichael Vogt <mvo@debian.org>2014-04-11 14:40:08 +0200
commit23fc5ecaa01bc41d582640dd5950be73987a8b4b (patch)
treedf6884ffed553a9e501560d8c3129f7acff89de6 /.gitignore
parent473ccfb9454e2707c2145ec49e671b78dc775e0c (diff)
parentd6570f8577a955a6950ef9fe1ee9def401759336 (diff)
Merge remote-tracking branch 'mvo/feature/helpful-apt-list' into debian/sid
Conflicts: test/integration/test-apt-cli-list
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions