Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
'ivan/feature/3310_add-support-for-multiple-schemas' into develop
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/leap/services/soledad/soledadbootstrapper.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
develop
|
|
Closes #3294.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
develop
|
|
|
|
|
|
|
|
|
|
|
|
into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Closes #3362.
|
|
|
|
|
|
|
|
'ivan/bug/3317_update-providerbootstrapper-tests' into develop
|
|
|
|
Closes #3317.
|
|
develop
|