diff options
| author | kali <kali@leap.se> | 2012-10-18 02:15:39 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-18 02:15:39 +0900 |
| commit | f6e900f024074435349eb778a2d89baed55e1e6c (patch) | |
| tree | 0c15d2ad81bc90d656c96e262ce62ad03ef9702f /tox.ini | |
| parent | f38e0eaf6aa23d06e7418bbb88a639f67888dc17 (diff) | |
| parent | a6c587edad293996e4015876d7e59432d6a4e8ea (diff) | |
Merge branch 'feature/detect_and_stop_vpn' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions