Skip to content
Commit d151944a authored by Jean-Laurent DUZANT's avatar Jean-Laurent DUZANT
Browse files

FIX #20175 TIME 0:05 fix conflicts in lang/en.json and lang/fr.json + merge... 

FIX #20175 TIME 0:05 fix conflicts in lang/en.json and lang/fr.json + merge branch 'develop' into 'feat/20175/develop'
parents 2cbb3e2e a523fb5d
Hide whitespace changes
Inline Side-by-side
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