Skip to content
Snippets Groups Projects
Commit 31570957 authored by Jean-Laurent DUZANT's avatar Jean-Laurent DUZANT
Browse files

Merge branch 'develop' into 'feat/17671/develop'

# Conflicts:
#   lang/en.json
#   lang/fr.json
parents ca4e40dd b308574f
No related branches found
No related tags found
No related merge requests found
Showing
with 582 additions and 244 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