Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts # packages/frontend/src/pages/timeline.vue
This commit is contained in:
commit
7313e13397
102 changed files with 2914 additions and 1291 deletions
|
|
@ -72,5 +72,6 @@ defineExpose<WidgetComponentExpose>({
|
|||
height: 350px;
|
||||
border: none;
|
||||
pointer-events: none;
|
||||
color-scheme: light;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue