Merge branch '3.0' into 3.1

2018-04-10 15:53:04 +12:00 · 2018-04-10 15:53:04 +12:00 · db0d4f0f98
parent c344575ef9 ae953b9a3c
commit db0d4f0f98
1 changed files with 1 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -15,11 +15,10 @@
        "silverstripe/asset-admin": "^1.0"
    },
    "require-dev": {
-        "phpunit/PHPUnit": "^5.7",
+        "phpunit/phpunit": "^5.7",
        "squizlabs/php_codesniffer": "^3.0"
    },
    "extra": {
-        "branch-alias": [],
        "expose": [
            "client/dist",
            "client/images"