diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-15 19:54:00 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-15 19:54:00 +0000 |
| commit | e8cebb568b70da50efccd7e018dc939b28bff76d (patch) | |
| tree | 3938625df3237c3ed0903ea9a15005f13bfba500 /src/components/react_button | |
| parent | fa01030641de7be89206787f5e364318086e8524 (diff) | |
| parent | 5077549c7314c5ba18160a2a1a0bb303f143c182 (diff) | |
Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'
# 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> |