diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-04 12:17:13 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-04 12:17:13 +0000 |
commit | f2f2f1032082d6212771bd0307136484f671d37e (patch) | |
tree | 3bf398443ad4f5f267f27297546be5bca892245f | |
parent | 757f52ff2e7e640e999082dca82d2498484201e0 (diff) | |
parent | 82884ac5c43092c0b0625f7d81c930bb023c9469 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
-rw-r--r-- | app/javascript/mastodon/actions/mutes.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/actions/mutes.js b/app/javascript/mastodon/actions/mutes.js index 3474250fe..daa76a8f7 100644 --- a/app/javascript/mastodon/actions/mutes.js +++ b/app/javascript/mastodon/actions/mutes.js @@ -1,6 +1,6 @@ import api, { getLinks } from '../api'; import { fetchRelationships } from './accounts'; -import { openModal } from '../../mastodon/actions/modal'; +import { openModal } from './modal'; export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST'; export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS'; @@ -100,4 +100,4 @@ export function toggleHideNotifications() { return dispatch => { dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS }); }; -} \ No newline at end of file +} |