kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 05:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into v6.2

Browse Source 
# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json
This commit is contained in:
James Cole
2024-12-18 16:39:22 +01:00
parent 2d10f255c2 fe6021a3d6
commit e8a6f30e4e
7 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -88,7 +88,7 @@
"guzzlehttp/guzzle": "^7.8",
"jc5/google2fa-laravel": "^2.0",
"jc5/recovery": "^2",
"laravel-json-api/laravel": "^4.0",
"laravel-json-api/laravel": "^5.0",
"laravel-json-api/non-eloquent": "^4.0",
"laravel-notification-channels/pushover": "^4.0",
"laravel/framework": "^11",