Merge pull request #1751 from pixelfed/staging

Staging
5 years ago · 342f3468fe
parent 52fdc0e1c7 9fc9058aa0
commit 342f3468fe
2 changed files with 302 additions and 188 deletions
--- a/composer.json
+++ b/composer.json
@ -13,7 +13,7 @@
        "ext-json": "*",
        "ext-mbstring": "*",
        "ext-openssl": "*",
-        "barryvdh/laravel-cors": "0.11.4",
+        "barryvdh/laravel-cors": "^0.11.4",
        "beyondcode/laravel-self-diagnosis": "^1.0.2",
        "doctrine/dbal": "^2.7",
        "fideloper/proxy": "^4.0",
--- a/composer.lock
+++ b/composer.lock