1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-30 07:34:07 +02:00

Merge branch 'develop' into vue3

This commit is contained in:
syuilo
2020-08-09 10:32:21 +09:00
32 changed files with 664 additions and 458 deletions

View File

@@ -151,7 +151,7 @@ export default defineComponent({
},
onKeypress(e) {
if ((e.which == 10 || e.which == 13) && e.ctrlKey && this.canSend) {
if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canSend) {
this.send();
}
},