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

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

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
parents 8ff12f7d 0f6506d4
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 670 additions and 640 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment