diff options
author | ThibG <thib@sitedethib.com> | 2020-05-29 22:13:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-29 22:13:06 +0200 |
commit | 491588f6b42fb42cf0b8e648aff958bac1add407 (patch) | |
tree | 3e58e945222e0335ef618bedd64cea0283a51182 /app/javascript/flavours/glitch/reducers/index.js | |
parent | e8714530a4173500a503452e9a9b5755156f14cd (diff) | |
parent | 9707dbee6fbbf8a5fa3c92762588a5405364acc6 (diff) |
Merge pull request #1341 from ThibG/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 586b84749..852abe9dd 100644 --- a/app/javascript/flavours/glitch/reducers/index.js +++ b/app/javascript/flavours/glitch/reducers/index.js @@ -36,6 +36,7 @@ import polls from './polls'; import identity_proofs from './identity_proofs'; import trends from './trends'; import announcements from './announcements'; +import markers from './markers'; const reducers = { announcements, @@ -75,6 +76,7 @@ const reducers = { pinnedAccountsEditor, polls, trends, + markers, }; export default combineReducers(reducers); |