diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-15 19:50:59 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-15 19:50:59 +0000 |
| commit | 22546ea8132ab73a1501256dd2686dbf88dfc308 (patch) | |
| tree | 73a19170bf4fbc535a093e9300e7900349e2a95f /src/components/react_button | |
| parent | 5d95376bef43b6c01ceee845cd42a355d74acdf2 (diff) | |
| parent | 5077549c7314c5ba18160a2a1a0bb303f143c182 (diff) | |
Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index dde67d21..ac940b98 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -20,10 +20,10 @@ <div class="reaction-picker"> <span v-for="emoji in commonEmojis" - :key="emoji" + :key="emoji.replacement" class="emoji-button" :title="emoji.displayText" - @click="addReaction($event, emoji, close)" + @click="addReaction($event, emoji.replacement, close)" > {{ emoji.replacement }} </span> |