diff options
| author | Tomas Touceda <chiiph@leap.se> | 2013-04-09 09:23:58 -0300 |
|---|---|---|
| committer | Tomas Touceda <chiiph@leap.se> | 2013-04-09 09:23:58 -0300 |
| commit | fb51905d5dde6880a40b551ba185d7932cc1ae07 (patch) | |
| tree | 33ff6b8fffdd55a791cf561b98773ef2d3cd2acf /changes/feature_2164_config-split | |
| parent | b48f78b47fd4bd0cd05cc7f588b878458e0ead6d (diff) | |
| parent | 3b253461e79f286f29b890cd0e4adb94c2695393 (diff) | |
Merge remote-tracking branch 'kali/feature/osx-platform-init' into develop
Conflicts:
src/leap/services/eip/vpnlaunchers.py
Diffstat (limited to 'changes/feature_2164_config-split')
0 files changed, 0 insertions, 0 deletions