Merge branch '3.6' into 4.0

2018-01-16 12:17:40 +00:00 · 2018-01-16 12:17:40 +00:00 · 2f59965515
parent ed16d96842 5ddb796d15
commit 2f59965515
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -47,4 +47,4 @@
    },
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}