Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # package.json # packages/backend/src/server/api/endpoints/notes/create.ts # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/components/MkTimeline.vue # packages/frontend/src/pages/settings/theme.vue
This commit is contained in:
commit
dfd491ff85
119 changed files with 1030 additions and 478 deletions
|
|
@ -7,6 +7,7 @@ import { markRaw, ref } from 'vue';
|
|||
import * as Misskey from 'misskey-js';
|
||||
import { miLocalStorage } from './local-storage.js';
|
||||
import type { SoundType } from '@/scripts/sound.js';
|
||||
import type { BuiltinTheme as ShikiBuiltinTheme } from 'shiki';
|
||||
import { Storage } from '@/pizzax.js';
|
||||
import { hemisphere } from '@/scripts/intl-const.js';
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue