summaryrefslogtreecommitdiff
path: root/debian/gbp.conf
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-08-26 18:42:58 +0200
committerMichael Vogt <mvo@debian.org>2013-08-26 18:42:58 +0200
commitd83f4c2e06b372d2871fcf0bfe5b7b2bbbfb2fc2 (patch)
treec909e02a4b4caf5d0da00243632a3479574f2350 /debian/gbp.conf
parent671e82247726a34007be22a439431ce0e7f55b48 (diff)
parentc71c4768d1f25a9bbc4dacbd0f58758ec9a3290f (diff)
Merge branch 'debian/sid' of ssh://git.debian.org/git/apt/apt into debian/sid
Conflicts: debian/changelog
Diffstat (limited to 'debian/gbp.conf')
0 files changed, 0 insertions, 0 deletions