summaryrefslogtreecommitdiff
path: root/src/leap/mx/alias_resolver.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-02 11:40:05 +0200
committerKali Kaneko <kali@leap.se>2013-08-02 11:40:05 +0200
commit30b1f13e23d7b56a1169dedc594a2be039d9e14c (patch)
tree6b368ce236bffad50eb60b3737d8f37d8a384068 /src/leap/mx/alias_resolver.py
parentb69c5b7892a08c03735606aabdf9a51590295c58 (diff)
parent803f23e45740c702ebc66f9741c0af564b54f3b8 (diff)
Merge remote-tracking branch 'chiiph/bug/import_asciiarmored' into develop
Diffstat (limited to 'src/leap/mx/alias_resolver.py')
0 files changed, 0 insertions, 0 deletions