diff options
| author | kali <kali@leap.se> | 2013-03-26 02:27:33 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-03-26 02:27:33 +0900 |
| commit | d8ed08649d8337c1b5de8ae1e87a71435f3505f0 (patch) | |
| tree | 015593af31ab422984ef47f859efef4c81c73bcc /src/leap/crypto/__init__.py | |
| parent | 36c944d24cd31fe380375ff7f8c709b1cf7c7827 (diff) | |
| parent | ee2ea741883aa6fa3b168431d588f20a5e90f5f2 (diff) | |
Merge branch 'feature/windows_install_tap' of git://github.com/chiiph/leap_client into develop
Conflicts:
src/leap/gui/mainwindow.py
Diffstat (limited to 'src/leap/crypto/__init__.py')
0 files changed, 0 insertions, 0 deletions