IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
James Cole 2022-07-16 09:46:43 +02:00
commit 1406abe7ae
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
7 changed files with 836 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -19,9 +19,9 @@
"laravel-mix": "^6.0",
"postcss": "^8.4",
"uiv": "^1.4",
"vue": "^2.6",
"vue": "^2.7",
"vue-i18n": "^8",
"vue-loader": "^15",
"vue-template-compiler": "^2.6"
"vue-template-compiler": "^2.7"
}
}

2
public/v1/js/app_vue.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/app_vue.js.LICENSE.txt
View File

@ -1,5 +1,5 @@
/*!
* Vue.js v2.7.2
* Vue.js v2.7.6
* (c) 2014-2022 Evan You
* Released under the MIT License.
*/

1626
yarn.lock
View File

File diff suppressed because it is too large Load Diff