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

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/core/modules/modProduct.class.php
parents d945a0de 9b37b52f
No related branches found
No related tags found
No related merge requests found
Showing
with 150 additions and 108 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment