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

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

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/compta/facture.php
parents 2b9b110f 522b5a91
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