Merge branches 'develop' and 'develop' of github.com:firefly-iii/firefly-iii into develop

This commit is contained in:
James Cole 2021-08-17 12:28:16 +02:00
commit d1fa375d6f
2 changed files with 5 additions and 5 deletions

View File

@ -23,7 +23,7 @@
"vue-loader": "^15",
"vue-template-compiler": "^2.6.12",
"vuex": "^3.6.2",
"webpack": "^5.40.0"
"webpack": "^5.50.0"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.3",

View File

@ -6687,10 +6687,10 @@ webpack-sources@^3.2.0:
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
webpack@^5.38.1, webpack@^5.40.0:
version "5.49.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.49.0.tgz#e250362b781a9fb614ba0a97ed67c66b9c5310cd"
integrity sha512-XarsANVf28A7Q3KPxSnX80EkCcuOer5hTOEJWJNvbskOZ+EK3pobHarGHceyUZMxpsTHBHhlV7hiQyLZzGosYw==
webpack@^5.38.1, webpack@^5.50.0:
version "5.50.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527"
integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag==
dependencies:
"@types/eslint-scope" "^3.7.0"
"@types/estree" "^0.0.50"