Merge branch 'hotfix/1.3.4'

terminal42 · Feb 9, 2016 · e1ddacf · e1ddacf
2 parents 3ae82a4 + 43caa55
commit e1ddacf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
     ],
     "require":{
         "php":">=5.3.2",
-        "contao/core":"^3.2",
-        "contao-community-alliance/composer-plugin":"2.*",
+        "contao/core-bundle":"~3.2 || ~4.1",
+        "contao-community-alliance/composer-plugin":"~2.4 || ~3.0",
         "codefog/contao-haste":"^4.10.0",
         "terminal42/dcawizard":"2.*"
     },