From eb51a8790fa8d186e207be58809e0d95c07335c8 Mon Sep 17 00:00:00 2001
From: Jason Chen <jhchen7@gmail.com>
Date: Sun, 6 Nov 2016 20:14:51 -0800
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 d34061e1c7..202ae040d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.1.4
+
+- Remove unnecessary type attribute in documentation [#1087](https://github.com/quilljs/quill/pull/1087)
+- Fix chrome 52+ input file label open slow [#1090](https://github.com/quilljs/quill/pull/1090)
+- Only query the last op's insertion string if it's actually an insert [#1095](https://github.com/quilljs/quill/pull/1095)
+
+Thank you [@jleen](https://github.com/jleen), [@kaelig](https://github.com/kaelig), and [@YouHan26](https://github.com/YouHan26) for your contributions to this release.
+
+
 # 1.1.3
 
 - Update quill-delta [delta#2](https://github.com/quilljs/delta/issues/2)
diff --git a/docs/_config.yml b/docs/_config.yml
index 284db273c1..9eed2b355b 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -9,7 +9,7 @@ gems:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-feed
-version: 1.1.3
+version: 1.1.4
 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 e7246d6074..d53e88ab75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quill",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Your powerful, rich text editor",
   "author": "Jason Chen <jhchen7@gmail.com>",
   "homepage": "http://quilljs.com",