Merge branch 'master' into develop

2016-12-29 13:03:32 +00:00
parent 077d404c5f b43890c11f
commit 36875bb98e
8 changed files with 35 additions and 19 deletions
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,8 @@
        ]
    },
    "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "sort-packages": true
    },
    "minimum-stability": "dev",
    "prefer-stable": true