diff options
author | ThibG <thib@sitedethib.com> | 2019-03-11 13:23:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-11 13:23:54 +0100 |
commit | 45e4c90a23ccd6ccbed389d5c1b62f830d2c3757 (patch) | |
tree | 6fbb79dda2e8a75c8b88bccd08078f346e8392ca /app/javascript/flavours/glitch/reducers | |
parent | f534f4869ecb52cb48f3e68e42752d8f81d7a710 (diff) | |
parent | 9c620fc5c80ff0f2aa600069dfdf868e150b0799 (diff) |
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/settings.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js index 384ff2d44..cc86a6b20 100644 --- a/app/javascript/flavours/glitch/reducers/settings.js +++ b/app/javascript/flavours/glitch/reducers/settings.js @@ -33,6 +33,7 @@ const initialState = ImmutableMap({ favourite: true, reblog: true, mention: true, + poll: true, }), quickFilter: ImmutableMap({ @@ -46,6 +47,7 @@ const initialState = ImmutableMap({ favourite: true, reblog: true, mention: true, + poll: true, }), sounds: ImmutableMap({ @@ -53,6 +55,7 @@ const initialState = ImmutableMap({ favourite: true, reblog: true, mention: true, + poll: true, }), }), |