diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-06-24 11:42:56 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-06-24 11:42:56 -0300 |
commit | a628dcbc372161d979548c09a3cb22f6878c8bd1 (patch) | |
tree | 1bf7d292dd7b0b76c2825ae8cd504f717da1e16b /data/resources | |
parent | 071cbe0e31f73ad774551a5d5474be9edb7a9c5c (diff) | |
parent | 19c90e02a65d1d6fe30e6915cd2a9440878aef83 (diff) |
Merge remote-tracking branch 'kali/feature/better-vpn-control' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions