From 6127eb2c0e8d9a30d68cb1ecf71b2fc1749368ac Mon Sep 17 00:00:00 2001
From: Robert Rees <robert.rees@guardian.co.uk>
Date: Wed, 2 Mar 2016 17:24:58 +0000
Subject: [PATCH] v2.1.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72bf9c42..6dd41bdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.1.2
+
+Fixes an issue where the undo manager could not be disabled due to an unconditional execution of the manager code in the setHTML method (issue #452).
+
 # 2.1.1
 
 Fixes an issue where the window global was still being referenced so the module still couldn't be used server-side.
diff --git a/package.json b/package.json
index 43f09b42..752b7fbe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scribe-editor",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "license": "Apache-2.0",
   "main": "src/scribe.js",
   "dependencies": {