Merge pull request #953 from ThibG/glitch-soc/merge-upstream

Merge upstream changes
2019-03-11 13:23:54 +01:00
parent f534f4869e 9c620fc5c8
commit 45e4c90a23
23 changed files with 313 additions and 69 deletions
--- 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,
    }),
  }),