diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-29 07:41:29 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-10-29 07:41:29 +0000 |
| commit | 21989c673ee3690f17ed3095e9fbc51501791c02 (patch) | |
| tree | de26f9a87bcaa6d8e576cf33165247f5c66b61af /src/components/emoji_input/emoji_input.js | |
| parent | 42f428d90e87315107dd20975548a5bd63dc2d53 (diff) | |
| parent | b66564a30dfadfdd2b216072931576c6c4dcbd61 (diff) | |
Merge branch 'settings-refactor' into 'develop'
Settings refactor
See merge request pleroma/pleroma-fe!960
Diffstat (limited to 'src/components/emoji_input/emoji_input.js')
| -rw-r--r-- | src/components/emoji_input/emoji_input.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index a586b819..366951c0 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -99,7 +99,7 @@ const EmojiInput = { }, computed: { padEmoji () { - return this.$store.state.config.padEmoji + return this.$store.getters.mergedConfig.padEmoji }, suggestions () { const firstchar = this.textAtCaret.charAt(0) |