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

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

Browse source
This commit is contained in:
KMY 2024-04-01 08:52:35 +09:00
commit bef755a577
111 changed files with 989 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ import antennas from './antennas';
import bookmark_categories from './bookmark_categories';
import bookmarkCategoryAdder from './bookmark_category_adder';
import bookmarkCategoryEditor from './bookmark_category_editor';
import boosts from './boosts';
import circleAdder from './circle_adder';
import circleEditor from './circle_editor';
import circles from './circles';
@ -30,14 +29,14 @@ import history from './history';
import listAdder from './list_adder';
import listEditor from './list_editor';
import lists from './lists';
import markers from './markers';
import { markersReducer } from './markers';
import media_attachments from './media_attachments';
import meta from './meta';
import { modalReducer } from './modal';
import { notificationPolicyReducer } from './notification_policy';
import { notificationRequestsReducer } from './notification_requests';
import notifications from './notifications';
import picture_in_picture from './picture_in_picture';
import { pictureInPictureReducer } from './picture_in_picture';
import polls from './polls';
import push_notifications from './push_notifications';
import reaction_deck from './reaction_deck';
@ -70,7 +69,6 @@ const reducers = {
relationships: relationshipsReducer,
settings,
push_notifications,
boosts,
server,
contexts,
compose,
@ -96,8 +94,8 @@ const reducers = {
suggestions,
polls,
trends,
markers,
picture_in_picture,
markers: markersReducer,
picture_in_picture: pictureInPictureReducer,
history,
tags,
followed_tags,