diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-18 14:42:24 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-18 14:42:24 -0300 |
| commit | 5d3f7c101b07329f8bdb557fe538f340a2b607d9 (patch) | |
| tree | 673de29d648810e2277a82eee43c2b49545248d2 /data/resources | |
| parent | f5247bf3baafbc5c5e83fb667aa05fc632e33496 (diff) | |
| parent | e0e85e8c375ed1afe297b1ff047cb5db13a837b0 (diff) | |
Merge remote-tracking branch 'kali/bug/workaround_keyring_imports' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions