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

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

Conflicts:
	htdocs/product/class/product.class.php
parents db4d92cc 34468644
No related branches found
No related tags found
No related merge requests found
...@@ -445,6 +445,7 @@ Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selec ...@@ -445,6 +445,7 @@ Fix: [ bug #2976 ] "Report" tab is the current tab but it is not marked as selec
Fix: [ bug #2861 ] Undefined variable $res when migrating Fix: [ bug #2861 ] Undefined variable $res when migrating
Fix: [ bug #2837 ] Product list table column header does not match column body Fix: [ bug #2837 ] Product list table column header does not match column body
Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order Fix: [ bug #2835 ] Customer prices of a product shows incorrect history order
Fix: [ bug #2814 ] JPEG photos are not displayed in Product photos page
***** ChangeLog for 3.5.6 compared to 3.5.5 ***** ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973 Fix: Avoid missing class error for fetch_thirdparty method #1973
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment