From f98315758cc5296786f9ee9dab8a6a8eda96b98b Mon Sep 17 00:00:00 2001
From: Will Myers <will@usebutton.com>
Date: Fri, 6 Jan 2017 15:18:58 -0500
Subject: [PATCH] Cut 2.3.0 release (#14)

* 2.3.0

* Cut 2.3.0 release

* Update CHANGELOG
---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8db94b..27572b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.3.0 January 6, 2017
+ - Add `merchants` resource
+     + `merchants#all`
+
 2.2.0 January 4, 2017
  - Add `client.utils.isWebhookAuthentic` function
 
diff --git a/package.json b/package.json
index 18b3806..7096af3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@button/button-client-node",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "node.js client for the Button Order API",
   "repository": {
     "type": "git",