kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	composer.lock
#	yarn.lock
This commit is contained in:
James Cole
2022-07-09 17:25:39 +02:00
parent 56ff25285c b97988a597
commit 9118a153d5
8 changed files with 201 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@@ -96,14 +96,14 @@
"league/commonmark": "2.*",
"league/csv": "^9.7",
"league/fractal": "0.*",
"nunomaduro/collision": "^6.1",
"nunomaduro/collision": "^6.2",
"pragmarx/google2fa": "^8.0",
"predis/predis": "^1.1",
"predis/predis": "^2.0",
"psr/log": "<4",
"ramsey/uuid": "^4.3",
"rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.8",
"spatie/laravel-ignition": "^1.2",
"spatie/laravel-ignition": "^1.3",
"symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0"
},