summaryrefslogtreecommitdiff
path: root/.tx/config
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-17 12:49:38 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-17 12:49:38 -0300
commit9d7152f7f7e81cf1c8838ad2cbeba3ff6fac41a7 (patch)
tree3957db7bc593a4cfb4ac61141d6dd44012935ba3 /.tx/config
parent9400d166db96fdcb2927245f5163ced0e29f2e07 (diff)
parent9dbbfeebbb4bb7c445e01f94533e88e514fd6821 (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/capture-keyring-errors' into develop
Diffstat (limited to '.tx/config')
0 files changed, 0 insertions, 0 deletions