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

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

Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
parents d7163fe5 5cbb3959
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