Skip to content
Snippets Groups Projects
Commit 8c2335f8 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

conflict whem merging xenofem changes

parents 96d2c86d 529d72c2
No related branches found
No related tags found
2 merge requests!12172.1.0 into master,!1161media description authoring v3
Hide whitespace changes
Inline Side-by-side
src/components/post_status_form/post_status_form.vue
+ 1
− 1
View file @ 8c2335f8
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment