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

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

Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
parents c71fc189 1fbf233f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 148 additions and 259 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment