diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-31 19:44:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-31 19:44:47 +0200 |
| commit | 147e90f35d9aadfbe15d044f3ce48be77e26968a (patch) | |
| tree | b8aad6a1a34cd897bdb187cdf1fb1cacf7ac721c /app/javascript/flavours/glitch/reducers/polls.js | |
| parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
| parent | ef270ed0df5a247b77853610f2f108206828a67a (diff) | |
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/polls.js')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/polls.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/polls.js b/app/javascript/flavours/glitch/reducers/polls.js index 9956cf83f..595f340bc 100644 --- a/app/javascript/flavours/glitch/reducers/polls.js +++ b/app/javascript/flavours/glitch/reducers/polls.js @@ -1,4 +1,4 @@ -import { POLLS_IMPORT } from 'mastodon/actions/importer'; +import { POLLS_IMPORT } from 'flavours/glitch/actions/importer'; import { Map as ImmutableMap, fromJS } from 'immutable'; const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll)))); |