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

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	app/Factory/TransactionJournalFactory.php
#	app/Providers/EventServiceProvider.php
#	app/Repositories/PiggyBank/ModifiesPiggyBanks.php
#	app/Support/Search/OperatorQuerySearch.php
#	app/Support/Steam.php
#	app/TransactionRules/Actions/UpdatePiggybank.php
#	composer.json
#	composer.lock
#	config/search.php
#	frontend/yarn.lock
#	resources/lang/en_US/firefly.php
This commit is contained in:
James Cole
2022-12-11 07:37:33 +01:00
parent 60d8bb2aab 86243131cd
commit 9529721368
30 changed files with 802 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@@ -92,7 +92,7 @@
"laravel/passport": "11.*",
"laravel/sanctum": "^3.0",
"laravel/slack-notification-channel": "^2.4",
"laravel/ui": "^4.0",
"laravel/ui": "^4.1",
"laravelcollective/html": "6.*",
"league/commonmark": "2.*",
"league/csv": "^9.7",
@@ -101,7 +101,7 @@
"pragmarx/google2fa": "^8.0",
"predis/predis": "^2.0",
"psr/log": "<4",
"ramsey/uuid": "^4.5",
"ramsey/uuid": "^4.6",
"rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.9",
"spatie/laravel-ignition": "^1.5",