Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts: themes/default-bootstrap/js/products-comparison.js
2013-12-06 17:24:00 +01:00
parent db37e42b21 03e0cb7515
commit 71ac20c819
23 changed files with 2952 additions and 2816 deletions
@@ -60,7 +60,7 @@ function addToCompare(productId) {
 	});
 }

-function compareButtonsStatusRefresh() {
+function compareButtonsStatusRefresh(){
 	$('.addToCompare').each(function() {
 		if ($.inArray(parseInt($(this).data('id-product')),comparedProductsIds)!== -1) {
 			$(this).addClass('checked');