bump version and update changelog

ThanDB · Aug 3, 2016 · 33ab38f · 33ab38f
1 parent 233b42d
commit 33ab38f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 1.0.0-beta.11
+
+Fixed some regressive bugs from previous release.
+
+### Bug Fixes
+
+- Fix activating more than one format before typing [#841](https://github.com/quilljs/quill/issues/841)
+- Run default matchers before before user defined ones [#843](https://github.com/quilljs/quill/issues/843)
+- Fix merging theme configurations [#844](https://github.com/quilljs/quill/issues/844), [#845](845)
+
+Thanks [benbro](https://github.com/benbro), [jackmu95](https://github.com/jackmu95), and [george-norris-salesforce](https://github.com/george-norris-salesforce) for the bug reports.
+
+
 # 1.0.0-beta.10
 
 Lots of bug fixes and performance improvements.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quill",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.11",
   "description": "Cross browser rich text editor",
   "author": "Jason Chen <jhchen7@gmail.com>",
   "homepage": "http://quilljs.com",