fix conflict
This commit is contained in:
commit
855b8d4dad
2 changed files with 2 additions and 1 deletions
|
@ -103,7 +103,7 @@
|
|||
:disabled="posting"
|
||||
class="form-post-body"
|
||||
@keydown.meta.enter="postStatus(newStatus)"
|
||||
@keyup.ctrl.enter="postStatus(newStatus)"
|
||||
@keydown.ctrl.enter="postStatus(newStatus)"
|
||||
@input="resize"
|
||||
@compositionupdate="resize"
|
||||
@paste="paste"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue