diff options
| author | kali <kali@leap.se> | 2012-10-08 07:57:42 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-08 07:57:42 +0900 |
| commit | 4d195cd5b6e6600ccf0df78946cab6038a1fcaec (patch) | |
| tree | 1362b2844f7e008cad8c29f26861566129af6edd /Makefile | |
| parent | 3a77603eae5fea0b1efb226860e0264ccf96f41b (diff) | |
| parent | 6728eb9afb21bad867e4052a6190a9bdb34c928a (diff) | |
Merge branch 'feature/network_check' into develop
Conflicts:
src/leap/baseapp/mainwindow.py
src/leap/eip/tests/test_checks.py
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions