Merge branch 'master' into dev

PrestaShop · Mar 26, 2018 · 6fddce5 · 6fddce5
2 parents 7d05070 + ac9c360
commit 6fddce5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_emailsubscription</name>
     <displayName><![CDATA[E-mail subscription form]]></displayName>
-    <version><![CDATA[2.0.0]]></version>
+    <version><![CDATA[2.1.0]]></version>
     <description><![CDATA[Adds a block for newsletter subscription.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <confirmUninstall><![CDATA[Are you sure that you want to delete all of your contacts?]]></confirmUninstall>

diff --git a/ps_emailsubscription.php b/ps_emailsubscription.php
@@ -57,7 +57,7 @@ public function __construct(EntityManager $entity_manager)
 
         $this->entity_manager = $entity_manager;
 
-        $this->version = '2.0.0';
+        $this->version = '2.1.0';
         $this->author = 'PrestaShop';
         $this->error = false;
         $this->valid = false;