Commit 31234a4b authored by Ozzie Isaacs's avatar Ozzie Isaacs

Merge remote-tracking branch 'fr/Update-French-transations' into master

# Conflicts:
#	cps/translations/fr/LC_MESSAGES/messages.po
parents 476275ea 08500c66
This diff is collapsed.
Markdown is supported
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