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/suggestions.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/suggestions.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/suggestions.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/reducers/suggestions.js b/app/javascript/flavours/glitch/reducers/suggestions.js index 834be728f..a08fedc25 100644 --- a/app/javascript/flavours/glitch/reducers/suggestions.js +++ b/app/javascript/flavours/glitch/reducers/suggestions.js @@ -4,8 +4,8 @@ import { SUGGESTIONS_FETCH_FAIL, SUGGESTIONS_DISMISS, } from '../actions/suggestions'; -import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'mastodon/actions/accounts'; -import { DOMAIN_BLOCK_SUCCESS } from 'mastodon/actions/domain_blocks'; +import { ACCOUNT_BLOCK_SUCCESS, ACCOUNT_MUTE_SUCCESS } from 'flavours/glitch/actions/accounts'; +import { DOMAIN_BLOCK_SUCCESS } from 'flavours/glitch/actions/domain_blocks'; import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'; const initialState = ImmutableMap({ |