post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'parent/main' into upstream-20240123

Browse source
This commit is contained in:
KMY 2025-01-23 18:10:34 +09:00
commit 50ae2d9439
320 changed files with 2587 additions and 2817 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/reducers/index.ts
View file

@ -10,7 +10,7 @@ import announcements from './announcements';
import { antennasReducer } from './antennas';
import { bookmarkCategoriesReducer } from './bookmark_categories';
import { circlesReducer } from './circles';
import compose from './compose';
import { composeReducer } from './compose';
import contexts from './contexts';
import conversations from './conversations';
import custom_emojis from './custom_emojis';
@ -63,7 +63,7 @@ const reducers = {
push_notifications,
server,
contexts,
compose,
compose: composeReducer,
search: searchReducer,
media_attachments,
notifications,