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

Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 

GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
parents 86d25146 f01e76f6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1355 deletions
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