diff options
author | ThibG <thib@sitedethib.com> | 2019-12-08 21:27:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-08 21:27:36 +0100 |
commit | 246addd5b33a172600342af3fb6fb5e4c80ad95e (patch) | |
tree | 98b87efd3f5f3d41d75482707924fde708c074ec /app/javascript/flavours/glitch/features/ui/components/video_modal.js | |
parent | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (diff) | |
parent | 49027ee948bc76cc89214f8f340d353763796f1d (diff) |
Merge pull request #1251 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/video_modal.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/video_modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/video_modal.js b/app/javascript/flavours/glitch/features/ui/components/video_modal.js index ef69f60f4..e7309021e 100644 --- a/app/javascript/flavours/glitch/features/ui/components/video_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/video_modal.js @@ -5,7 +5,7 @@ import Video from 'flavours/glitch/features/video'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import Icon from 'mastodon/components/icon'; +import Icon from 'flavours/glitch/components/icon'; export default class VideoModal extends ImmutablePureComponent { |