Age | Commit message (Collapse) | Author |
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reorders imports and delays them after the args are processed.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
develop
|
|
|
|
|
|
|
|
Closes #3425.
|
|
|
|
|
|
|
|
|
|
|
|
'ivan/feature/3404_multiple-schema-support-for-soledad' into develop
|
|
|
|
|
|
|
|
into develop
|
|
|
|
into develop
|
|
|
|
|
|
|