conflict whem merging xenofem changes
This commit is contained in:
commit
8c2335f84f
1 changed files with 1 additions and 1 deletions
|
@ -255,7 +255,7 @@
|
|||
v-model="newStatus.mediaDescriptions[file.id]"
|
||||
type="text"
|
||||
:placeholder="$t('post_status.media_description')"
|
||||
@keydown.prevent.enter=""
|
||||
@keydown.enter.prevent=""
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue