diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-14 15:36:32 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-14 15:36:32 -0300 |
| commit | e137a622440779acada41fe16a07bf4598645c06 (patch) | |
| tree | ba5ac3ce859cfda7213b9c359e34bd2fc3be7da8 /LICENSE | |
| parent | 4daab9b4bb279679611c1e4ec51c08f5987be27c (diff) | |
| parent | d88afefd26592f91edbf3f5a2eea165508ca4afa (diff) | |
Merge remote-tracking branch 'ivan/feature/advanced_key_management' into develop
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions