summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/gpg.py
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-08-27 14:45:19 -0400
committerMicah Anderson <micah@riseup.net>2013-08-27 14:45:19 -0400
commitce411ee35e22a4d17b953ce4f8d22c7b648857c7 (patch)
tree078c282115974d0d4bbdeb97748c26948ae70fcd /src/leap/keymanager/gpg.py
parentf82457d8b3533dfa71b452cf1881ff3393368dd9 (diff)
parentca67759c55395c694af51b4ae619fce794b31a1f (diff)
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts: debian/changelog
Diffstat (limited to 'src/leap/keymanager/gpg.py')
0 files changed, 0 insertions, 0 deletions