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

Merge branch 'main' into develop

Browse Source 
# Conflicts:
#	package-lock.json
#	resources/assets/v1/package.json
This commit is contained in:
James Cole
2024-08-25 07:37:50 +02:00
parent b4f51e7b47 d78d254e86
commit 57f5ebc0f9
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/v1/package.json
View File

@@ -15,8 +15,8 @@
},
"devDependencies": {
"@johmun/vue-tags-input": "^2",
"@vue/compiler-sfc": "^3.4.34",
"axios": "^1.3",
"@vue/compiler-sfc": "^3.3.4",
"axios": "^1.7",
"bootstrap-sass": "^3",
"cross-env": "^7.0",
"font-awesome": "^4.7.0",