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
|
|
@ -137,6 +137,7 @@ function close() {
|
|||
margin-top: 12px;
|
||||
font-size: 0.8em;
|
||||
line-height: 1.5em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
> .indicatorWithValue {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue