Skip to content
Snippets Groups Projects
Commit 7389f655 authored by Alexandre Morin's avatar Alexandre Morin
Browse files

Merge branch 'hotfix/2.1.1' into 'feature/7318-HideButtonAddOrganization'

# Conflicts:
#   src/bundle/recordsManagement/Controller/archiveCommunicationTrait.php
parents dfad5910 dbf9b70d
No related branches found
No related tags found
4 merge requests!38Hotfix/2.1.1,!37Hotfix/2.1.1,!36Hotfix/2.1.1,!34Feature/7318 hide button add organization
Showing
with 1394 additions and 78 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment