From 1a660db2d02c5dd4114c23696fc7ab7e6c1c6b92 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <jasonmit@yahoo-inc.com>
Date: Tue, 18 Aug 2015 15:45:06 -0700
Subject: [PATCH] version bump to 3.6.0 :cake:

---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c57fdc0f..509e9e54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### 3.6.0
+
+* 2.0-beta + 2.0-canary supported again
+* test support for deprecated helpers
+* global allowEmpty configuration option
+* removes unused helper modules from builds (slimmer dists)
+
 ### 3.5.1
 
 * destroy interval timers on Helper destroy
diff --git a/package.json b/package.json
index 13575b38..c663f674 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-moment",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Moment.js template helpers and computed property macros for Ember",
   "directories": {
     "doc": "doc",