summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-03-26 13:21:00 -0300
committerTomás Touceda <chiiph@leap.se>2014-03-26 13:21:00 -0300
commit9af1cadaf6ba35c934b7e9d49291b2ecb3ece706 (patch)
treee7d19d944c06b78eadaf1412aa787b3435fdee1c /.gitignore
parent95709184a3a1f9b99e491579d0dcd21cd3a13c08 (diff)
parenteef78aae4164a740f5673c38202f0a32b3615c1e (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/bad-object-in-save-callback' into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions