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

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

Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
parents 10f7b23d 64a2cce7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment