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