Merge pull request #1247 from julien/release/2.0.0

chore: Prepare for release v2.0.0
liferay · Apr 24, 2019 · 48f6fdf · 48f6fdf
2 parents 6919e66 + 3ba3060
commit 48f6fdf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [v2.0.0](https://github.com/liferay/alloy-editor/tree/v2.0.0) (2019-04-24)
+
+[Full changelog](https://github.com/liferay/alloy-editor/compare/v2.0.0-beta.7...v2.0.0)
+
+- fix: Fix issues with video resizing and alignment ([\#1246](https://github.com/liferay/alloy-editor/pull/1246))
+- chore: make Travis use Node v11 (#1237) ([\#1238](https://github.com/liferay/alloy-editor/pull/1238))
+- fix: console errors in Windows-based build (#1228) ([\#1236](https://github.com/liferay/alloy-editor/pull/1236))
+- feat: change icon and color used in button-color button
+- fix: css issues with resizer in IE11
+
 ## [v2.0.0-beta.7](https://github.com/liferay/alloy-editor/tree/v2.0.0-beta.7) (2019-04-04)
 
 [Full changelog](https://github.com/liferay/alloy-editor/compare/v2.0.0-beta.6...v2.0.0-beta.7)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alloyeditor",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0",
   "description": "AlloyEditor, a modern WYSIWYG editor, build on top of CKEditor",
   "devDependencies": {
     "babel-core": "^6.26.0",