Skip to content
Snippets Groups Projects
Commit 6febc7de authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Merge branch 'master' into issue/998/missing_translations_in_certification_modal 

# Conflicts:
#	www/i18n/locale-ca.json
#	www/i18n/locale-eo-EO.json
#	www/i18n/locale-es-ES.json
#	www/i18n/locale-it-IT.json
#	www/i18n/locale-pt-PT.json
parents d89b6e70 b1cd4495
No related branches found
No related tags found
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