Merge pull request #151 from craftcms/bugfix/150-craft-code-editor-co…

…mposer-constraint-and-update updated composer constraint and update
craftcms · Feb 2, 2024 · 4f8441b · 4f8441b
2 parents 1b15638 + f27ccd1
commit 4f8441b
Show file tree

Hide file tree

Showing 3 changed files with 302 additions and 290 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where the CKEditor config-creation slideout could keep reappearing if canceled. ([#138](https://github.com/craftcms/ckeditor/pull/138))
+- Fixed a conflict with `nystudio107/craft-code-editor` 1.0.14 and 1.0.15. ([#150](https://github.com/craftcms/ckeditor/issues/150)) 
 
 ## 3.6.0 - 2023-09-13
 

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "php": "^8.0.2",
     "craftcms/cms": "^4.5.0-beta.2",
     "craftcms/html-field": "^2.0.0-alpha.2",
-    "nystudio107/craft-code-editor": "^1.0.8"
+    "nystudio107/craft-code-editor": ">=1.0.8 <=1.0.13 || ^1.0.16"
   },
   "require-dev": {
     "craftcms/ecs": "dev-main",