From 8ed594b340644fa413d0c4dee95e80152fe85222 Mon Sep 17 00:00:00 2001
From: Rich Leland <rich.leland@messagesystems.com>
Date: Tue, 26 Apr 2016 17:21:36 -0400
Subject: [PATCH] Bump version, update changelog

---
 readme.txt              | 6 +++++-
 wordpress-sparkpost.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index cd0c2253..4a6722da 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.0
 Tested up to: 4.4.2
-Stable tag: 2.2.1
+Stable tag: 2.3.0
 License: GPLv2 or later
 
 Send all your email from WordPress through SparkPost, the most advanced email delivery service.
@@ -47,6 +47,10 @@ Visit our [support site](https://support.sparkpost.com/) for help.
 
 == Changelog ==
 
+= 2.3.0 =
+
+- Fixed issue [#33](https://github.com/SparkPost/wordpress-sparkpost/issues/33) where from email and reply to were being overridden by templates: see [this article](https://support.sparkpost.com/customer/portal/articles/2409547-using-templates-with-the-sparkpost-wordpress-plugin) for detailed information
+
 = 2.2.1 =
 - Fix issue for previous version of WordPress
 
diff --git a/wordpress-sparkpost.php b/wordpress-sparkpost.php
index cd2ea47f..0fff057e 100644
--- a/wordpress-sparkpost.php
+++ b/wordpress-sparkpost.php
@@ -6,7 +6,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.2.1
+Version: 2.3.0
 Author: SparkPost
 Author URI: http://sparkpost.com
 License: GPLv2 or later