Merge pull request #13 from billmn/composer-fix

Composer fix
9 years ago · fce07ad258
parent 1a5d27109e 4a44ceb6a8
commit fce07ad258
2 changed files with 365 additions and 1686 deletions
--- a/flarum/composer.json
+++ b/flarum/composer.json
@ -11,7 +11,7 @@
        "franzl/whoops-middleware": "dev-master"
    },
    "require-dev": {
-        "franzl/studio": "1.0.x@dev"
+        "franzl/studio": "0.10.x@dev"
    },
    "config": {
        "preferred-install": "dist"
--- a/flarum/composer.lock
+++ b/flarum/composer.lock