Merge branch 'dev'

This commit is contained in:
Jerome Nadaud
2014-08-18 11:10:19 +02:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -52,7 +52,7 @@ class Blocktopmenu extends Module
{
$this->name = 'blocktopmenu';
$this->tab = 'front_office_features';
$this->version = '2.0.1';
$this->version = '2.0.2';
$this->author = 'PrestaShop';
$this->bootstrap = true;
@@ -941,7 +941,7 @@ class Blocktopmenu extends Module
'title' => $this->l('Menu Top Link'),
'icon' => 'icon-link'
),
'info' => '<div class="alert alert-warning">' .$this->l('All active products combinations quantities will be change').'</div>',
'info' => '<div class="alert alert-warning">' .$this->l('All active products combinations quantities will be changed').'</div>',
'input' => array(
array(
'type' => 'switch',
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>blocktopmenu</name>
<displayName><![CDATA[Top horizontal menu]]></displayName>
<version><![CDATA[2.0.1]]></version>
<version><![CDATA[2.0.2]]></version>
<description><![CDATA[Adds a new horizontal menu to the top of your e-commerce website.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>