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

2013-11-07 16:48:56 +01:00
parent b51b388eaa 75171c77dd
commit 01d8376ee7
729 changed files with 8289 additions and 30730 deletions
@@ -36,7 +36,8 @@ class BlockCategories extends Module
 		$this->version = '2.2';
 		$this->author = 'PrestaShop';

-		parent::__construct();
+		$this->bootstrap = true;
+		parent::__construct();	

 		$this->displayName = $this->l('Categories block');
 		$this->description = $this->l('Adds a block featuring product categories.');