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

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

Conflicts:
	htdocs/product/fiche.php
	htdocs/user/class/user.class.php
parents 8248ab4f 106b4a66
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