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

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

Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/product/stock/mouvement.php
parents 053d5eef f225b35a
No related branches found
No related tags found
No related merge requests found
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment