Skip to content
Snippets Groups Projects
Commit f412e7d7 authored by Rodrigo Nascimento's avatar Rodrigo Nascimento
Browse files

Merge remote-tracking branch 'origin/develop' into join-i18n

# Conflicts:
#	i18n/pt.i18n.json
parents e0d3b750 56c2a2c3
No related branches found
No related tags found
No related merge requests found
Showing
with 718 additions and 490 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment