Merge branch 'develop' into vue3

2020-08-19 22:15:04 +09:00
parent 5f1bcdc423 c34f302b1c
commit fc09479d0a
119 changed files with 3454 additions and 640 deletions
--- a/src/client/pages/messaging/index.vue
+++ b/src/client/pages/messaging/index.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="mk-messaging" v-size="[{ max: 400 }]">
+<div class="mk-messaging" v-size="{ max: [400] }">
 	<portal to="icon"><fa :icon="faComments"/></portal>
 	<portal to="title">{{ $t('messaging') }}</portal>