kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-08 15:05:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	app/Events/ChangedPiggyBankAmount.php
#	app/Handlers/Events/PiggyBankEventHandler.php
#	changelog.md
#	composer.lock
#	config/firefly.php
This commit is contained in:
James Cole
2023-01-02 16:17:52 +01:00
parent e5d5e774dc 93ae82691b
commit b56acf36c5
7 changed files with 109 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -101,7 +101,7 @@
"pragmarx/google2fa": "^8.0",
"predis/predis": "^2.0",
"psr/log": "<4",
"ramsey/uuid": "^4.6",
"ramsey/uuid": "^4.7",
"rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.9",
"spatie/laravel-ignition": "^1.5",