Merge branch 'master' into remove-login_server

This commit is contained in:
Moriz Wahl 2022-01-31 14:29:38 +01:00 committed by GitHub
commit b824686b5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions

View File

@ -49,7 +49,7 @@
"qrcode": "^1.4.4", "qrcode": "^1.4.4",
"regenerator-runtime": "^0.13.7", "regenerator-runtime": "^0.13.7",
"vee-validate": "^3.4.5", "vee-validate": "^3.4.5",
"vue": "^2.6.11", "vue": "2.6.12",
"vue-apollo": "^3.0.7", "vue-apollo": "^3.0.7",
"vue-cli-plugin-i18n": "^1.0.1", "vue-cli-plugin-i18n": "^1.0.1",
"vue-flatpickr-component": "^8.1.2", "vue-flatpickr-component": "^8.1.2",

View File

@ -4,6 +4,8 @@ import App from './App.vue'
import i18n from './i18n.js' import i18n from './i18n.js'
import { loadAllRules } from './validation-rules' import { loadAllRules } from './validation-rules'
import 'regenerator-runtime'
import addNavigationGuards from './routes/guards' import addNavigationGuards from './routes/guards'
import { store } from './store/store' import { store } from './store/store'

View File

@ -14264,7 +14264,7 @@ vue2-transitions@^0.2.3:
resolved "https://registry.yarnpkg.com/vue2-transitions/-/vue2-transitions-0.2.3.tgz#69c9d75b1db05f231b80980c03459d68490ba27d" resolved "https://registry.yarnpkg.com/vue2-transitions/-/vue2-transitions-0.2.3.tgz#69c9d75b1db05f231b80980c03459d68490ba27d"
integrity sha512-Ou5x74AOQbM8JjZV8pIssFFqavvj53QzrEEUr5QnElUYb1ZizPwaUJo0ZqmLPqjwPae7ON4SG8U2cSTI4tHKLg== integrity sha512-Ou5x74AOQbM8JjZV8pIssFFqavvj53QzrEEUr5QnElUYb1ZizPwaUJo0ZqmLPqjwPae7ON4SG8U2cSTI4tHKLg==
vue@^2.2.6, vue@^2.6.11: vue@2.6.12, vue@^2.2.6, vue@^2.6.11:
version "2.6.12" version "2.6.12"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==