diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-02-11 23:09:15 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-02-11 23:09:15 +0000 |
| commit | 84ebae8ed36390f62ccda653d4fb9d8aad1482a2 (patch) | |
| tree | 70fb486e4b31b029c8dbcb89f87acf154275f905 /src/modules/config.js | |
| parent | 60446c56a5c8d4b4d669fbd4803e77ce686daac9 (diff) | |
| parent | 96dc297babd5797b9307af8676719c2eb8cd80e2 (diff) | |
Merge branch 'develop' into 'themes-accent'
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
Diffstat (limited to 'src/modules/config.js')
| -rw-r--r-- | src/modules/config.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index eb763c10..e6b373b4 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -23,6 +23,7 @@ export const defaultState = { autoLoad: true, streaming: false, hoverPreview: true, + emojiReactionsOnTimeline: true, autohideFloatingPostButton: false, pauseOnUnfocused: true, stopGifs: false, @@ -32,7 +33,8 @@ export const defaultState = { mentions: true, likes: true, repeats: true, - moves: true + moves: true, + emojiReactions: false }, webPushNotifications: false, muteWords: [], |