Merge remote-tracking branch 'origin/master'

Conflicts: composer.json
pdir · Dec 5, 2017 · cb7ee3e · cb7ee3e
2 parents ba79fc0 + 3a3ee1d
commit cb7ee3e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "source" : "https://github.com/pdir/contao-theme-helper-bundle"
   },
   "require": {
-    "php": ">=7.4.0",
+    "php": ">=7.0.0",
     "contao/core-bundle": "^4.4"
   },
   "conflict": {
@@ -32,7 +32,5 @@
   },
   "extra": {
     "contao-manager-plugin": "Pdir\\Contao\\ThemeHelperBundle\\ContaoManager\\Plugin"
-  },
-  "prefer-stable": true,
-  "minimum-stability": "dev"
+  }
 }