Merge pull request #1751 from pixelfed/staging

Staging
This commit is contained in:
daniel 2019-10-01 21:44:44 -06:00 committed by GitHub
commit 342f3468fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 304 additions and 190 deletions

View file

@ -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",

492
composer.lock generated

File diff suppressed because it is too large Load diff