Skip to content
GitLab
Commit 851ece18 authored by dockx thibault's avatar dockx thibault
Browse files

Merge branch... 

Merge branch '6220-codestyle-1-3-1-requires-adaptation-to-align-code-style-with-1-4' into '1.3-fixes'

Resolve "[CodeStyle] - 1.3.1 Requires adaptation to align code style with 1.4"

See merge request fusiondirectory/fd!964
parents d84cf055 68a72040
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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 433 additions and 436 deletions
+433 -436
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