Merge branch 'develop' into 5.8-dev

# Conflicts: # yarn.lock
2024-11-22 08:56:39 -06:00 · 2022-07-16 09:46:43 +02:00 · 2022-07-16 09:46:43 +02:00 · 1406abe7ae
commit 1406abe7ae
parent 4e47641c76 c97792d1d1
7 changed files with 836 additions and 804 deletions
--- a/package.json
+++ b/package.json
@ -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"
    }
 }
--- a/public/v1/js/app_vue.js
+++ b/public/v1/js/app_vue.js
--- a/public/v1/js/app_vue.js.LICENSE.txt
+++ b/public/v1/js/app_vue.js.LICENSE.txt
@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.7.2
+ * Vue.js v2.7.6
 * (c) 2014-2022 Evan You
 * Released under the MIT License.
 */
--- a/public/v1/js/create_transaction.js
+++ b/public/v1/js/create_transaction.js
--- a/public/v1/js/edit_transaction.js
+++ b/public/v1/js/edit_transaction.js
--- a/public/v1/js/profile.js
+++ b/public/v1/js/profile.js
--- a/yarn.lock
+++ b/yarn.lock