diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-05 18:19:01 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-05 18:19:01 -0300 |
| commit | 9c13850bbf871808d265380d9e549c4ed8278c7b (patch) | |
| tree | f3a2e23ecb9b7bd01fa2b73efaf32ae92f5c2f51 /.gitattributes | |
| parent | 9a82c662bbc334a66f3aa021f1bbbc1f32cddcc8 (diff) | |
| parent | 0292e05ea741bea0fd4fe22b799fd2eead0bd67e (diff) | |
Merge remote-tracking branch 'kali/bug/workaround-keyring-version-problem' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions