diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-18 22:05:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-18 22:05:11 +0100 |
| commit | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (patch) | |
| tree | dfeaba762dfa49844cc5cf6140deb30874734a46 /app/javascript/flavours/glitch/features/compose/containers/upload_container.js | |
| parent | 2be88d1930433f55e5ae17174f3711cefb3d5158 (diff) | |
| parent | ea9a1d79df60749eb21fb592c608dcaa4c935c75 (diff) | |
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/containers/upload_container.js')
| -rw-r--r-- | app/javascript/flavours/glitch/features/compose/containers/upload_container.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js index f3ca4ce7b..2189c870b 100644 --- a/app/javascript/flavours/glitch/features/compose/containers/upload_container.js +++ b/app/javascript/flavours/glitch/features/compose/containers/upload_container.js @@ -1,7 +1,6 @@ import { connect } from 'react-redux'; import Upload from '../components/upload'; -import { undoUploadCompose, initMediaEditModal } from 'flavours/glitch/actions/compose'; -import { submitCompose } from 'flavours/glitch/actions/compose'; +import { undoUploadCompose, initMediaEditModal, submitCompose } from 'flavours/glitch/actions/compose'; const mapStateToProps = (state, { id }) => ({ media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id), |