Merge branch 'develop' into 5.8-dev

# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
This commit is contained in:
James Cole
2022-10-16 19:13:15 +02:00
41 changed files with 1560 additions and 1554 deletions

View File

@@ -26,5 +26,8 @@
"vue-i18n": "^8",
"vue-loader": "^15",
"vue-template-compiler": "^2.7"
},
"dependencies": {
"stream-browserify": "^3.0.0"
}
}