From cb3aba0613dec4a5cfd6f15d1b4ffb31ae539ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Tue, 8 Jan 2019 12:31:02 +0200
Subject: [PATCH] Prepare release 3.17.2

---
 mailpoet.php | 4 ++--
 readme.txt   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mailpoet.php b/mailpoet.php
index f2e2dc21a1..16574a9700 100644
--- a/mailpoet.php
+++ b/mailpoet.php
@@ -4,7 +4,7 @@ if(!defined('ABSPATH')) exit;
 
 /*
  * Plugin Name: MailPoet 3 (New)
- * Version: 3.17.1
+ * Version: 3.17.2
  * Plugin URI: http://www.mailpoet.com
  * Description: Create and send newsletters, post notifications and welcome emails from your WordPress.
  * Author: MailPoet
@@ -18,7 +18,7 @@ if(!defined('ABSPATH')) exit;
  */
 
 $mailpoet_plugin = array(
-  'version' => '3.17.1',
+  'version' => '3.17.2',
   'filename' => __FILE__,
   'path' => dirname(__FILE__),
   'autoloader' => dirname(__FILE__) . '/vendor/autoload.php',
diff --git a/readme.txt b/readme.txt
index e101f412af..319ae28b3e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: mailpoet, wysija
 Tags: email marketing, newsletter, newsletter subscribers, email, welcome email, post notification, WooCommerce emails, newsletter builder
 Requires at least: 4.7
 Tested up to: 5.0
-Stable tag: 3.17.1
+Stable tag: 3.17.2
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -169,6 +169,10 @@ Stop by our [support site](https://www.mailpoet.com/support).
 
 == Changelog ==
 
+= 3.17.2 - 2019-01-08 =
+* Fixed: possible conflict with other plugins using webpack. Thanks, Julien;
+* Fixed: creating a new WooCommerce email now defaults to the Woo template page tab instead of standard templates tab;
+
 = 3.17.1 - 2018-12-19 =
 * Fixed: premium plugin crash; Thanks, Sebastian!