gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 13:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
This commit is contained in:
James Cole
2022-09-07 18:35:01 +02:00
parent 6add8765c4 f47464944b
commit 7104433a68
49 changed files with 1133 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@@ -85,11 +85,11 @@
"diglactic/laravel-breadcrumbs": "^8.0",
"doctrine/dbal": "3.*",
"gdbots/query-parser": "^2.0",
"guzzlehttp/guzzle": "^7.4",
"guzzlehttp/guzzle": "^7.5",
"jc5/google2fa-laravel": "^2.0",
"jc5/recovery": "^2",
"laravel/framework": "^9",
"laravel/passport": "10.*",
"laravel/passport": "11.*",
"laravel/sanctum": "^3.0",
"laravel/ui": "^4.0",
"laravelcollective/html": "6.*",
@@ -103,7 +103,7 @@
"ramsey/uuid": "^4.4",
"rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.8",
"spatie/laravel-ignition": "^1.3",
"spatie/laravel-ignition": "^1.4",
"symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0"
},