From debbd123a2a17b67508af9fa8e7efa101de3d3e4 Mon Sep 17 00:00:00 2001
From: Jason Chen <jhchen7@gmail.com>
Date: Sun, 23 Oct 2016 17:25:52 -0700
Subject: [PATCH] bump version and update changelog

---
 CHANGELOG.md     | 9 +++++++++
 docs/_config.yml | 2 +-
 package.json     | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff62aa6065..5f31160209 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.1.2
+
+- Fix setContents on already formatted text [#1065](https://github.com/quilljs/quill/issues/1065)
+- Fix regression [#1067](https://github.com/quilljs/quill/issues/1067)
+- Improve documentation [#1069](https://github.com/quilljs/quill/pull/1069) [#1070](https://github.com/quilljs/quill/pull/1070)
+
+Thank you [benbro](https://github.com/benbro), [derickruiz](https://github.com/derickruiz), [eamodio](https://github.com/eamodio), [hallaathrad](https://github.com/hallaathrad), and [philly385](https://github.com/philly385) for your contributions to this release.
+
+
 # 1.1.1
 
 ### Bug fixes
diff --git a/docs/_config.yml b/docs/_config.yml
index 4c571ca194..5cba99c2bf 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -9,7 +9,7 @@ gems:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-feed
-version: 1.1.1
+version: 1.1.2
 cdn: //cdn.quilljs.com/
 github: https://github.com/quilljs/quill/tree/develop/docs
 quill: quill.min.js
diff --git a/package.json b/package.json
index c590e32cb4..95810483af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quill",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Your powerful, rich text editor",
   "author": "Jason Chen <jhchen7@gmail.com>",
   "homepage": "http://quilljs.com",