Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications'

# Conflicts: # CHANGELOG.md
2020-06-16 14:51:12 +00:00 · 2020-06-16 14:51:12 +00:00 · 84a69f9502
commit 84a69f9502
parent c18a8ab308 57626c125d
2 changed files with 3 additions and 1 deletions
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -81,6 +81,7 @@
            v-model="newStatus.spoilerText"
            type="text"
            :placeholder="$t('post_status.content_warning')"
+            :disabled="posting"
            class="form-post-subject"
          >
        </EmojiInput>