bump version and update changelog

slab · Jan 21, 2017 · 759e96d · 759e96d
1 parent 2bc4f65
commit 759e96d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.2.0
+
+Add concept of experimental APIs: they are APIs meant to try out support for use cases we would like to address, but gives flexibility to find the right API interface. As such they are not covered by Semantic Versioning. Several are added to start things off: `find`, `getIndex`, `getLeaf`, `getLine`, `getLines`.
+
+- Merge disabling list keyboard shortcut when list format is disabled [#1257](https://github.com/quilljs/quill/pull/1257)
+
+Thanks to [@haugstrup](https://github.com/haugstrup) for your contributions to this release.
+
+
 # 1.1.10
 
 - Preserve user selection on API changes [#1152](https://github.com/quilljs/quill/issues/1152)

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -9,7 +9,7 @@ gems:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-feed
-version: 1.1.10
+version: 1.2.0
 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
@@ -1,6 +1,6 @@
 {
   "name": "quill",
-  "version": "1.1.10",
+  "version": "1.2.0",
   "description": "Your powerful, rich text editor",
   "author": "Jason Chen <[email protected]>",
   "homepage": "http://quilljs.com",