Skip to content
Snippets Groups Projects
Commit 792eba48 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch '3.7-transifex' of github.com:GPCsolutions/dolibarr into 

GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang
parents 79314b7f 10456f90
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 72 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment