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

Merge remote-tracking branch 'origin/master' into develop 

# Conflicts:
#	www/i18n/locale-it-IT.json
parents 8dfd7257 6d942d66
No related branches found
No related tags found
No related merge requests 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