Merge tag 'v3.2.1' into instance_only_statuses

2020-11-19 22:47:16 +01:00
parent 8126ac030e a583e54023
commit 92c4d909a0
40 changed files with 481 additions and 205 deletions
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@ -315,7 +315,7 @@ class EmojiPickerDropdown extends React.PureComponent {

        this.setState({ loading: false });
      }).catch(() => {
-        this.setState({ loading: false });
+        this.setState({ loading: false, active: false });
      });
    }