gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 13:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/ci

Browse Source
This commit is contained in:
James Cole
2020-07-31 04:55:23 +00:00
committed by GitHub
parent 8f568d41ca cd19e86141
commit 8a91618f8d
343 changed files with 2636 additions and 2431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
composer.json
View File

@@ -83,23 +83,23 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"adldap2/adldap2-laravel": "6.*",
"bacon/bacon-qr-code": "1.*",
"bacon/bacon-qr-code": "2.*",
"davejamesmiller/laravel-breadcrumbs": "5.*",
"doctrine/dbal": "2.*",
"fideloper/proxy": "4.*",
"jc5/google2fa-laravel": "2.0.4",
"jc5/google2fa-laravel": "2.0.5",
"laravel/framework": "^7.0",
"laravel/passport": "8.*",
"laravel/passport": "9.*",
"laravel/ui": "^2.0",
"laravelcollective/html": "6.*",
"league/commonmark": "1.*",
"league/csv": "^9.6",
"league/fractal": "0.*",
"pragmarx/google2fa": "^7.0",
"pragmarx/google2fa": "^8.0",
"pragmarx/recovery": "^0.1.0",
"predis/predis": "^1.1",
"ramsey/uuid": "^3.9",
"rcrowe/twigbridge": "^0.11.2"
"ramsey/uuid": "^4.1",
"rcrowe/twigbridge": "^0.12.1"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "2.*",
@@ -111,7 +111,7 @@
"nunomaduro/larastan": "^0.6.1",
"phpstan/phpstan": "^0.12.33",
"phpstan/phpstan-deprecation-rules": "^0.12.5",
"phpunit/phpunit": "^8.5",
"phpunit/phpunit": "^9.2",
"psalm/plugin-laravel": "^1.1",
"roave/security-advisories": "dev-master",
"thecodingmachine/phpstan-strict-rules": "^0.12.0",