Skip to content
GitLab
Commit 50ddbdf6 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch 'cherry-pick-d7485a64' into '1.2.1-fixes' 

Merge branch '5824-ldif-generation-does-not-respect-tls-setting' into '1.2.1-fixes'

See merge request fusiondirectory/fd!344
parents 4421507c fb02bbb4
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment