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

Conflicts:
	htdocs/product/class/product.class.php
This commit is contained in:
Laurent Destailleur 2015-06-16 11:18:10 +02:00
commit 85fee7ec49

View File

@ -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 #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 #2814 ] JPEG photos are not displayed in Product photos page
***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973