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

Merge branch 'develop' into 'fix/20778/develop'

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