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/actions | |
| 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/actions')
| -rw-r--r-- | app/javascript/flavours/glitch/actions/notifications.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js index f89b4cb36..dd4f5fd44 100644 --- a/app/javascript/flavours/glitch/actions/notifications.js +++ b/app/javascript/flavours/glitch/actions/notifications.js @@ -106,7 +106,7 @@ const excludeTypesFromSettings = state => state.getIn(['settings', 'notification const excludeTypesFromFilter = filter => { - const allTypes = ImmutableList(['follow', 'favourite', 'reblog', 'mention']); + const allTypes = ImmutableList(['follow', 'favourite', 'reblog', 'mention', 'poll']); return allTypes.filterNot(item => item === filter).toJS(); }; |