Skip to content
GitLab
Commit 92502531 authored by bmanager bmanager's avatar bmanager bmanager
Browse files

Merge branch '1.2-fixes' into 'master' 

merge 1.2 fixes into master

See merge request fusiondirectory/fd!266
parents e2d13694 384ff14f
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 core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1393 additions and 882 deletions
+1393 -882
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