Merge branch 'main' into glitch-soc/merge-upstream

2021-07-17 17:45:35 +02:00
parent e42ed4502f e54a65013d
commit d1c87be8cf
8 changed files with 19 additions and 36 deletions
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@ -21,7 +21,7 @@ export default class VideoModal extends ImmutablePureComponent {
  };

  componentDidMount () {
-    const { media, onChangeBackgroundColor, onClose } = this.props;
+    const { media, onChangeBackgroundColor } = this.props;

    const backgroundColor = getAverageFromBlurhash(media.get('blurhash'));