diff options
| author | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
| commit | d873e4f3d5878a2b2800758cbe3b9c870c228d51 (patch) | |
| tree | 23a3a373699381d4bd4f629136b9c82de5df96a3 /app/javascript/flavours/glitch/containers | |
| parent | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (diff) | |
| parent | 2332b3f146b0d879daba8a99bd35c8bf425edea3 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours/glitch/containers')
| -rw-r--r-- | app/javascript/flavours/glitch/containers/poll_container.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/containers/poll_container.js b/app/javascript/flavours/glitch/containers/poll_container.js index cd7216de7..da93cc905 100644 --- a/app/javascript/flavours/glitch/containers/poll_container.js +++ b/app/javascript/flavours/glitch/containers/poll_container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import Poll from 'mastodon/components/poll'; +import Poll from 'flavours/glitch/components/poll'; const mapStateToProps = (state, { pollId }) => ({ poll: state.getIn(['polls', pollId]), |