From 60044325c581db1f2094c3a3b343bd003f8b689c Mon Sep 17 00:00:00 2001
From: mhossain <mohammad.hossain@sparkpost.com>
Date: Thu, 16 Feb 2017 13:47:08 -0500
Subject: [PATCH] v2.6.4 release prep

---
 admin.widget.class.php  | 4 ++--
 readme.txt              | 9 +++++++--
 wordpress-sparkpost.php | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/admin.widget.class.php b/admin.widget.class.php
index 22ddf16b..9b737c47 100644
--- a/admin.widget.class.php
+++ b/admin.widget.class.php
@@ -247,8 +247,8 @@ public function render_template_field()
             <ul>
                 <li>- Please see <a href="https://support.sparkpost.com/customer/portal/articles/2409547-using-templates-with-the-sparkpost-wordpress-plugin" target="_blank">this article</a> for detailed information about using templates with this plugin.</li>
                 <li>- Templates can only be used with the HTTP API.</li>
-                <li>- <a href="https://github.com/SparkPost/wordpress-sparkpost/blob/master/docs/templates-attachments.md" target="_blank">Does not work with attachment</a>.
-                <li>- Leave this field blank to disable use of a template or use it dynamically (i.e. <a href="https://github.com/SparkPost/wordpress-sparkpost/blob/master/docs/hooks.md" target="_blank">using hooks</a>).</li>
+                <li>- <a href="https://github.com/SparkPost/wordpress-sparkpost/blob/master/docs/templates-attachments.md" target="_blank">Does not work with attachment.</a>
+                <li>- Leave this field blank to disable use of a template. You can still specify it by <a href="https://github.com/SparkPost/wordpress-sparkpost/blob/master/docs/hooks.md" target="_blank">using hooks</a>.</li>
             </ul>
         </small>
     <?php
diff --git a/readme.txt b/readme.txt
index 0b0a2ccd..cef66c27 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: sparkpost, rajuru
 Tags: sparkpost, smtp, wp_mail, mail, email
 Requires at least: 4.3
 Tested up to: 4.7.2
-Stable tag: 2.6.3
+Stable tag: 2.6.4
 License: GPLv2 or later
 
 Send all your email from WordPress through SparkPost, the most advanced email delivery service.
@@ -46,6 +46,11 @@ Visit plugin's [official issue tracker](https://github.com/SparkPost/wordpress-s
 
 
 == Changelog ==
+= 2.6.4 =
+- Fix the issue to use template hook when not set in settings ([#95](https://github.com/SparkPost/wordpress-sparkpost/issues/95))
+- Clarify attachment can't be sent with template and include workaround example ([#96](https://github.com/SparkPost/wordpress-sparkpost/issues/96))
+- Include attachment in test email
+
 = 2.6.3 =
 - Add plugin name to XMailer (for SMTP)
 - Tested in WordPress v4.7.2
@@ -119,4 +124,4 @@ Visit plugin's [official issue tracker](https://github.com/SparkPost/wordpress-s
 
 == Upgrade Notice ==
 
-From WordPress plugins list, click `update now`. 
+From WordPress plugins list, click `update now`.
diff --git a/wordpress-sparkpost.php b/wordpress-sparkpost.php
index ef0d018c..27496f61 100644
--- a/wordpress-sparkpost.php
+++ b/wordpress-sparkpost.php
@@ -4,7 +4,7 @@
 Plugin Name: SparkPost
 Plugin URI: http://sparkpost.com/
 Description: Send all your email from Wordpress through SparkPost, the world's most advanced email delivery service.
-Version: 2.6.3
+Version: 2.6.4
 Author: SparkPost
 Author URI: http://sparkpost.com
 License: GPLv2 or later
@@ -17,7 +17,7 @@
 
 define('WPSP_PLUGIN_DIR', plugin_dir_path(__FILE__));
 define('WPSP_PLUGIN_PATH', WPSP_PLUGIN_DIR . basename(__FILE__));
-define('WPSP_PLUGIN_VERSION', '2.6.3');
+define('WPSP_PLUGIN_VERSION', '2.6.4');
 
 require_once(WPSP_PLUGIN_DIR . 'sparkpost.class.php');