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

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

Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
parents 9c70c2c3 76ba3301
Branches main
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 206 additions and 70 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment