diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-09-30 11:28:12 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-09-30 11:28:12 -0300 |
| commit | ac502ce982de1191a0af89683db517fe7c90914b (patch) | |
| tree | ccb3b1c7ebec50e457eb4cc99dee69da058d5c43 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 4728ea9e5cbb0f7ed47e7ca609c0531a31c847e0 (diff) | |
| parent | 37e27011b7bd8d5fe7825b1757f0b381fe8467e5 (diff) | |
Merge remote-tracking branch 'kali/feature/provider_check_against_ca_bundle' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 200d68aa..d8d0ac21 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -36,9 +36,9 @@ from leap.bitmask.gui import statemachines from leap.bitmask.gui.statuspanel import StatusPanelWidget from leap.bitmask.gui.wizard import Wizard +from leap.bitmask.provider.providerbootstrapper import ProviderBootstrapper from leap.bitmask.services.eip.eipbootstrapper import EIPBootstrapper from leap.bitmask.services.eip.eipconfig import EIPConfig -from leap.bitmask.services.eip.providerbootstrapper import ProviderBootstrapper # XXX: Soledad might not work out of the box in Windows, issue #2932 from leap.bitmask.services.soledad.soledadbootstrapper import \ SoledadBootstrapper |