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

Merge remote-tracking branch 'parent/main' into kb_development

Browse source
This commit is contained in:
KMY 2023-09-23 20:14:11 +09:00
commit 36f3bbb909
28 changed files with 135 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ import contexts from './contexts';
import conversations from './conversations';
import custom_emojis from './custom_emojis';
import domain_lists from './domain_lists';
import dropdown_menu from './dropdown_menu';
import { dropdownMenuReducer } from './dropdown_menu';
import filters from './filters';
import followed_tags from './followed_tags';
import height_cache from './height_cache';
@ -56,7 +56,7 @@ import user_lists from './user_lists';
const reducers = {
announcements,
dropdown_menu,
dropdownMenu: dropdownMenuReducer,
timelines,
meta,
alerts,