summaryrefslogtreecommitdiff
path: root/data/ts
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-05 07:35:25 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-05 07:35:25 -0300
commit0896d4f96a8475af1d48c6da75337fed1ccf73fc (patch)
tree8e965145dd0989d3c1b68c6217ab148f3ff062a2 /data/ts
parentae72f363e10a147e8d8d9cb5555bc2a42bb74e44 (diff)
parent4945a2233363b496640e71a5f7bc0fd37d185592 (diff)
Merge remote-tracking branch 'refs/remotes/kali/feature/virtualenvwrapper-tests' into develop
Diffstat (limited to 'data/ts')
0 files changed, 0 insertions, 0 deletions