diff options
author | Kali Kaneko <kali@leap.se> | 2015-02-11 14:01:20 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-02-11 14:01:20 -0400 |
commit | 961861044fd2bb50e6e445b05291c03133389d3d (patch) | |
tree | b17de439fdbfafff239fb2fa60e143523f72c042 /keymanager/changes/feature-6212_multi_uid_support | |
parent | d3a7f97ebc32434cd012f4cd5d334e775e2ead49 (diff) | |
parent | abf2bde0d74e9f6dbafa7fc088a094d7684f8d5a (diff) |
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'keymanager/changes/feature-6212_multi_uid_support')
0 files changed, 0 insertions, 0 deletions