Age | Commit message (Collapse) | Author |
|
|
|
'ivan/feature/3505_preferences-select-gateway-manually' into develop
|
|
|
|
|
|
|
|
Also the test code in the bottom was updated to work.
|
|
|
|
|
|
...And this should be fixed forever and ever now.
or until we change namespaces/package names again :)
|
|
Closes #3610.
|
|
|
|
into develop
Conflicts:
src/leap/bitmask/config/leapsettings.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'ivan/feature/3552_refactor-basic-password-checks' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into develop
|
|
|
|
using environment variable.
Closes: #3409
|
|
|
|
'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Otherwise it is not taken as an argument for openvpn.
|
|
|
|
|
|
|
|
|
|
|
|
This reorders imports and delays them after the args are processed.
|
|
|
|
|
|
|