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

Fixes #5466 Added a conflict system

parent 83977fd8
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 6379-core-ogroups-creation-with-backend-default-user-available-for-selection 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 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 21 deletions
+39 -21
  • bmortier @bmortier

    mentioned in issue #1744 (closed)

    By Côme Chilliet on 2017-09-02T15:36:50 (imported from GitLab)

     ·

    mentioned in issue #1744 (closed)

    By Côme Chilliet on 2017-09-02T15:36:50 (imported from GitLab)

    Toggle commit list
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