IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-16 10:14:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.7.0

Browse Source 
# Conflicts:
#	composer.lock
This commit is contained in:
James Cole 2022-03-28 12:26:38 +02:00
commit d978838c84
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
3 changed files with 7 additions and 7 deletions
Show Stats 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": "^1.1",
"psr/log": "<3",
"ramsey/uuid": "^4.2",
"ramsey/uuid": "^4.3",
"rcrowe/twigbridge": "^0.14",
"spatie/data-transfer-object": "^3.7",
"spatie/laravel-ignition": "^1.0",

6
frontend/yarn.lock
View File

@ -4451,9 +4451,9 @@ no-case@^3.0.4:
tslib "^2.0.3"
node-forge@^1.2.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
version "1.3.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
node-loader@2.0.0:
version "2.0.0"

6
yarn.lock
View File

@ -3774,9 +3774,9 @@ no-case@^3.0.4:
tslib "^2.0.3"
node-forge@^1.2.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
version "1.3.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.0.tgz#37a874ea723855f37db091e6c186e5b67a01d4b2"
integrity sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
node-libs-browser@^2.2.1:
version "2.2.1"