scalie-business
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

missed git merge

This commit is contained in:
khr 2021-07-05 23:57:46 +02:00
parent 8a8a6b559b
commit bb420ed0bb
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -196,11 +196,6 @@ class ComposeForm extends ImmutablePureComponent {
render () {
const { intl, onPaste, showSearch } = this.props;
const disabled = this.props.isSubmitting;
<<<<<<< HEAD
=======
const text = [this.props.spoilerText, countableText(this.props.text)].join('');
const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 4096 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
>>>>>>> scalybiz-3.2rc
let publishText = '';
if (this.props.privacy === 'private' || this.props.privacy === 'direct') {