Merge branch 'dev'

afc0e5e5 · Henning Leutz · de5c363f · c823380f · afc0e5e5
Commit afc0e5e5 erstellt vor 6 Jahren von Henning Leutz
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
    "require": {
        "quiqqer\/quiqqer": "*",
        "quiqqer\/qui": ">=1|dev-master|dev-dev",
-        "ckeditor\/ckeditor": "4.6.*"
+        "ckeditor\/ckeditor": "4.10.*"
    },
    "autoload": {
        "psr-4": {