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

2012-12-31 12:03:54 +01:00
parent b28d561e4b 31859f6e6f
commit a76d05b650
1 changed files with 2 additions and 0 deletions
@@ -1,2 +1,4 @@
 ALTER TABLE  `PREFIX_product` ADD `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '404' AFTER `active`;
 ALTER TABLE  `PREFIX_product_shop` ADD `redirect_type` ENUM('', '404', '301', '302') NOT NULL DEFAULT '404' AFTER `active`;
+
+ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT NOT NULL;