diff options
| author | Shpuld Shpludson <shp@cock.li> | 2021-02-28 15:37:39 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2021-02-28 15:37:39 +0000 |
| commit | 91f93d4a55cbf927a6adee35dc184b09d1f9b75d (patch) | |
| tree | 882fb179fa7ed36e6c212a4874559b27a73f3d1e /src/components/emoji_input/emoji_input.vue | |
| parent | 670abd633f97e75cf35981ee0f617d0be1b43816 (diff) | |
| parent | b4782ad159026e3fb50c476e5cf9d89176e441f4 (diff) | |
Merge branch 'develop' into 'feat/timeline-quick-settings'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/emoji_input/emoji_input.vue')
| -rw-r--r-- | src/components/emoji_input/emoji_input.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index 1d6c760e..ad62484d 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -9,8 +9,8 @@ <button v-if="!hideEmojiButton" class="button-unstyled emoji-picker-icon" - @click.prevent="togglePicker" type="button" + @click.prevent="togglePicker" > <FAIcon :icon="['far', 'smile-beam']" /> </button> |