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

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

Browse source
This commit is contained in:
KMY 2024-12-16 10:14:31 +09:00
commit 3784ad273c
555 changed files with 7564 additions and 3363 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,11 +30,11 @@ import { notificationPolicyReducer } from './notification_policy';
import { notificationRequestsReducer } from './notification_requests';
import notifications from './notifications';
import { pictureInPictureReducer } from './picture_in_picture';
import polls from './polls';
import { pollsReducer } from './polls';
import push_notifications from './push_notifications';
import reaction_deck from './reaction_deck';
import { relationshipsReducer } from './relationships';
import search from './search';
import { searchReducer } from './search';
import server from './server';
import settings from './settings';
import status_lists from './status_lists';
@ -64,7 +64,7 @@ const reducers = {
server,
contexts,
compose,
search,
search: searchReducer,
media_attachments,
notifications,
notificationGroups: notificationGroupsReducer,
@ -77,7 +77,7 @@ const reducers = {
filters,
conversations,
suggestions: suggestionsReducer,
polls,
polls: pollsReducer,
trends,
markers: markersReducer,
picture_in_picture: pictureInPictureReducer,