Merge branch 'develop'

Author: Bert Oost

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Craft CMS 3 - Froala WYSIWYG Editor Changelog
 
+## v2.8.5 - 2018-12-13
+
+### Changed
+
+- Updated editor to version 2.8.5 along with the plugin version
+
 ## v2.8.4.3 - 2018-08-17
 
 ### Changed

composer.json

@@ -2,7 +2,7 @@
   "name": "froala/craft-froala-wysiwyg",
   "description": "Craft 3 CMS plugin for Froala WYSIWYG HTML Rich Text Editor.",
   "type": "craft-plugin",
-  "version": "2.8.4.3",
+  "version": "2.8.5",
   "keywords": [
     "craft",
     "craftcms",
@@ -14,7 +14,8 @@
   "homepage": "https://github.com/froala/Craft-3-Froala-WYSIWYG",
   "license": "MIT",
   "require": {
-    "froala/wysiwyg-editor": "2.8.4"
+    "craftcms/cms": "^3.0.0",
+    "froala/wysiwyg-editor": "2.8.5"
   },
   "autoload": {
     "psr-4": {
@@ -29,4 +30,4 @@
     "developerUrl": "https://bertoost.com",
     "documentationUrl": "https://github.com/froala/Craft-3-Froala-WYSIWYG/blob/master/README.md"
   }
-}
+}