Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream
This commit is contained in:
commit
aaf06a8186
7 files changed
+54
-8
No files matched your search
@@ -228,7 +228,7 @@ class EmojiPickerMenuImpl extends PureComponent {
|
||||
|
||||
handleClick = (emoji, event) => {
|
||||
if (!emoji.native) {
|
||||
emoji.native = emoji.colons;
|
||||
emoji.native = `:${emoji.id}:`;
|
||||
}
|
||||
if (!(event.ctrlKey || event.metaKey)) {
|
||||
|
||||
|
||||
Reference in new issue
Block a user