diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-09-28 14:10:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-28 14:10:30 +0200 |
commit | 00889b313176308018d66e54b5cb7dcc92da1587 (patch) | |
tree | 2123cb37613d91a9446d9030e6d43600eea6a7e8 /app/javascript/flavours/glitch/reducers/index.js | |
parent | 4b7e43602691193b5d2a8e7e0ed6044bc8ee9774 (diff) | |
parent | c4ccbbccabf2ed6a899e3ca46fa9c2f8bf72b269 (diff) |
Merge pull request #1609 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/index.js b/app/javascript/flavours/glitch/reducers/index.js index c452e834c..7d7fe6fd3 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -40,6 +40,7 @@ import announcements from './announcements'; import markers from './markers'; import account_notes from './account_notes'; import picture_in_picture from './picture_in_picture'; +import accounts_map from './accounts_map'; const reducers = { announcements, @@ -54,6 +55,7 @@ const reducers = { status_lists, accounts, accounts_counters, + accounts_map, statuses, relationships, settings, |