gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
KMY 2024-03-19 09:15:20 +09:00
commit 76598bd542
496 changed files with 5795 additions and 3709 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,6 @@ import announcements from './announcements';
import antennaAdder from './antenna_adder';
import antennaEditor from './antenna_editor';
import antennas from './antennas';
import blocks from './blocks';
import bookmark_categories from './bookmark_categories';
import bookmarkCategoryAdder from './bookmark_category_adder';
import bookmarkCategoryEditor from './bookmark_category_editor';
@ -35,7 +34,6 @@ import markers from './markers';
import media_attachments from './media_attachments';
import meta from './meta';
import { modalReducer } from './modal';
import mutes from './mutes';
import { notificationPolicyReducer } from './notification_policy';
import { notificationRequestsReducer } from './notification_requests';
import notifications from './notifications';
@ -72,8 +70,6 @@ const reducers = {
relationships: relationshipsReducer,
settings,
push_notifications,
mutes,
blocks,
boosts,
server,
contexts,