diff options
| author | eris <femmediscord@gmail.com> | 2021-07-22 20:47:36 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-07-22 20:47:36 +0000 |
| commit | f35e3d0f3fc1a6bb4ebd77fba1dce0ac27f5b7d7 (patch) | |
| tree | b051403a1d8afb16d4f82dbc879c0f3187266ddd /src/components/emoji_input/emoji_input.vue | |
| parent | 139a0d15620763329499265d505ae8f030e2ed69 (diff) | |
| parent | 425919a0d292b79869ebefd2a4d52ed4db45d319 (diff) | |
Fix merge conflict in CHANGELOG
# 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 e6f9a9d3..aa2950ce 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -1,9 +1,9 @@ <template> <div + ref="root" v-click-outside="onClickOutside" class="emoji-input" :class="{ 'with-picker': !hideEmojiButton }" - ref='root' > <slot /> <template v-if="enableEmojiPicker"> |