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

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

Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/stock/mouvement.php
parents 4541d189 da8e71b2
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment