sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/misskey-dev/master'

Browse Source 
Conflicts:
	package.json
	packages/client/src/components/MkButton.vue
	packages/client/src/components/ui/button.vue
	packages/client/src/pages/timeline.tutorial.vue
This commit is contained in:
こけっち
2022-09-10 21:24:53 +09:00
parent bf781707c5 a2a1636c10
commit 38ae0c4c1e
373 changed files with 3168 additions and 2416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/client/src/pages/welcome.timeline.vue
View File

@ -23,9 +23,9 @@
<script lang="ts">
import { defineComponent } from 'vue';
import XReactionsViewer from '@/components/reactions-viewer.vue';
import XMediaList from '@/components/media-list.vue';
import XPoll from '@/components/poll.vue';
import XReactionsViewer from '@/components/MkReactionsViewer.vue';
import XMediaList from '@/components/MkMediaList.vue';
import XPoll from '@/components/MkPoll.vue';
import * as os from '@/os';
export default defineComponent({