diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-11-13 16:56:38 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-11-13 16:56:38 -0300 |
| commit | 836c556149cec70b8d9306e91ea9a39bc905806c (patch) | |
| tree | 904404e37b5e5e188d8ec97f45568d1858c5e42c /.gitignore | |
| parent | ff31617ff26293ed7ffcfa5b72d803bc3c766cc7 (diff) | |
| parent | 223d17f74f59121875d2eb42c3a4e4d638ae2f08 (diff) | |
Merge remote-tracking branch 'kali/feature/catch_keymanager_error' into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions