Skip to content
Snippets Groups Projects
Commit ef68e619 authored by Adrien Faveraux's avatar Adrien Faveraux
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	pkg/vtiger/translations/French/modules/Users.php
#	pkg/vtiger/translations/French/modules/Vtiger.php
parents 2ae511fa 927713e0
No related branches found
No related tags found
2 merge requests!311Language italian translation,!287French Trad update
Showing
with 661 additions and 246 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