Merge branch 'dev'

3b0a3a29 · Henning Leutz · 1d8fd4c8 · 09897713 · 3b0a3a29
Commit 3b0a3a29 erstellt 8 years ago von Henning Leutz
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
  },
  "require": {
    "quiqqer/quiqqer": "*",
-    "quiqqer\/qui": ">=1.*|dev-master|dev-dev",
+    "quiqqer\/qui": ">=1|dev-master|dev-dev",
    "ckeditor/ckeditor": "4.6.*"
  }
 }