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

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 

Conflicts:
	htdocs/admin/dict.php
	htdocs/product/price.php
parents 0e7da2cd 74e00c4d
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