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

2013-12-06 10:17:12 +01:00
parent c2e0edcc7a 5e18a94d2a
commit 669a49be59
26 changed files with 2124 additions and 1682 deletions
@@ -675,4 +675,4 @@ function checkAllZones(elt)
 		$('.fees div.input-group input:text, .fees_all div.input-group input:text').attr('disabled', 'disabled');
 	}
 	
-}
+}