Merge branch 'develop' into vue3

This commit is contained in:
syuilo 2020-08-19 22:15:04 +09:00
commit fc09479d0a
119 changed files with 3454 additions and 640 deletions

View file

@ -66,7 +66,7 @@ import MkButton from '../../components/ui/button.vue';
import MkInput from '../../components/ui/input.vue';
import MkSelect from '../../components/ui/select.vue';
import MkPagination from '../../components/ui/pagination.vue';
import MkInstanceInfo from './federation.instance.vue';
import MkInstanceInfo from './instance.vue';
export default defineComponent({
metaInfo() {