diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-11 16:36:20 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-11 16:36:20 -0300 |
| commit | aa1241acb0c2480b3368337193df675a5ea2ecbc (patch) | |
| tree | 2de0d79b8442a29363e25317e8b8f6667a038b34 /.gitattributes | |
| parent | fa68f4a86173aca3313d4254811471bc93d2a86d (diff) | |
| parent | 5adf4d457ed964b7cc00def5d2be0dabd66fa04c (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/feature/syncdb-adapt-3' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions