Merge tag 'v3.1.4' into hometown-dev

2020-05-15 15:34:04 -07:00
parent 1d70261350 c9dcc2d39f
commit 877a478466
1182 changed files with 15087 additions and 6745 deletions
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@ -265,7 +265,6 @@ export default function compose(state = initialState, action) {
    });
  case COMPOSE_SPOILERNESS_CHANGE:
    return state.withMutations(map => {
-      map.set('spoiler_text', '');
      map.set('spoiler', !state.get('spoiler'));
      map.set('idempotencyKey', uuid());