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-20241126

Browse source
This commit is contained in:
KMY 2024-11-26 12:56:31 +09:00
commit 8a075ba4c6
303 changed files with 7495 additions and 4498 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,15 +7,9 @@ import { accountsReducer } from './accounts';
import accounts_map from './accounts_map';
import alerts from './alerts';
import announcements from './announcements';
import antennaAdder from './antenna_adder';
import antennaEditor from './antenna_editor';
import antennas from './antennas';
import bookmark_categories from './bookmark_categories';
import bookmarkCategoryAdder from './bookmark_category_adder';
import bookmarkCategoryEditor from './bookmark_category_editor';
import circleAdder from './circle_adder';
import circleEditor from './circle_editor';
import circles from './circles';
import { antennasReducer } from './antennas';
import { bookmarkCategoriesReducer } from './bookmark_categories';
import { circlesReducer } from './circles';
import compose from './compose';
import contexts from './contexts';
import conversations from './conversations';
@ -26,9 +20,7 @@ import filters from './filters';
import followed_tags from './followed_tags';
import height_cache from './height_cache';
import history from './history';
import listAdder from './list_adder';
import listEditor from './list_editor';
import lists from './lists';
import { listsReducer } from './lists';
import { markersReducer } from './markers';
import media_attachments from './media_attachments';
import meta from './meta';
@ -79,18 +71,10 @@ const reducers = {
notificationGroups: notificationGroupsReducer,
height_cache,
custom_emojis,
lists,
listEditor,
listAdder,
antennas,
antennaEditor,
antennaAdder,
circles,
circleEditor,
circleAdder,
bookmark_categories,
bookmarkCategoryEditor,
bookmarkCategoryAdder,
lists: listsReducer,
antennas: antennasReducer,
circles: circlesReducer,
bookmark_categories: bookmarkCategoriesReducer,
filters,
conversations,
suggestions,