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

This commit is contained in:
Claire committed 2021-07-17 17:45:35 +02:00
commit d1c87be8cf
8 files changed
+19 -36

No files matched your search

@@ -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'));