Skip to content
Snippets Groups Projects
Commit d19fe11e authored by Hamza HRAMCHI's avatar Hamza HRAMCHI
Browse files

Merge branch 'develop' into 'feat/23856/develop' 

# Conflicts:
#   sql/data_fr.sql
parents a3dce748 0c32777e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 9 deletions
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