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

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

Browse source
This commit is contained in:
KMY 2025-03-28 08:44:30 +09:00
commit 12ed20b6d5
257 changed files with 3505 additions and 2010 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import { combineReducers } from 'redux-immutable';
import { accountsReducer } from './accounts';
import accounts_map from './accounts_map';
import alerts from './alerts';
import { alertsReducer } from './alerts';
import announcements from './announcements';
import { antennasReducer } from './antennas';
import { bookmarkCategoriesReducer } from './bookmark_categories';
@ -49,7 +49,7 @@ const reducers = {
dropdownMenu: dropdownMenuReducer,
timelines,
meta,
alerts,
alerts: alertsReducer,
loadingBar: loadingBarReducer,
modal: modalReducer,
user_lists,