diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-08-16 14:08:13 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-08-16 14:08:13 -0300 |
commit | 759884a61cd5b7b8916c2db274c149637919737e (patch) | |
tree | 95ca37c7261844f94123fc0b013923c205dada4f /src/leap/common/config/baseconfig.py | |
parent | 14201c17040342a0a46944a1f2bbc2014b93cf45 (diff) | |
parent | 37e4cf3cc1bb03a781080e40d8a5d3146b36e088 (diff) |
Merge remote-tracking branch 'kali/feature/imap_keymanager_events' into develop
Diffstat (limited to 'src/leap/common/config/baseconfig.py')
0 files changed, 0 insertions, 0 deletions