diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-29 09:50:38 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-29 09:50:38 -0300 |
| commit | cec2baa24f454c9f9168b5faed1a465e9943f591 (patch) | |
| tree | f5428d3c2a0a02e484a69f24063a11f1d9327dda /debian/.#control | |
| parent | 205fcd6c6bb8712a115f3dfe738c490f5427e09b (diff) | |
| parent | 7fc904d797cb3c07f593157df1126b4179fe48d8 (diff) | |
Merge remote-tracking branch 'drebs/feature/2341-use-indexes-to-store-and-fetch-keys' into develop
Conflicts:
src/leap/common/keymanager/keys.py
Diffstat (limited to 'debian/.#control')
0 files changed, 0 insertions, 0 deletions