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

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

Conflicts:
	htdocs/product/stock/card.php
parents 06df952e e2c606f4
No related branches found
No related tags found
No related merge requests found
Showing
with 160 additions and 57 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment