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

Merge remote-tracking branch 'origin/3.5' into develop 

Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
parents 918de2d0 75e76dc2
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 319 additions and 159 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment