diff options
author | nicolas <nclm@users.noreply.github.com> | 2016-11-24 20:13:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-24 20:13:30 +0100 |
commit | 60577f4c6ee9f4a4c9af0a41a8954e19a5f2c8cf (patch) | |
tree | 8c661ea7ceaff780965631c530ca065805c1861d /app/assets/javascripts/components/containers/mastodon.jsx | |
parent | 5e33445c5ff9ded56c2d40eb17d89ace108c3840 (diff) | |
parent | 8e34bed7cce7b97388e55fabacee7d424b5846ea (diff) |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
-rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index 87c7c65f3..c9f037ec2 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -75,11 +75,6 @@ const Mastodon = React.createClass({ return store.dispatch(updateTimeline(data.timeline, JSON.parse(data.message))); case 'delete': return store.dispatch(deleteFromTimelines(data.id)); - case 'merge': - case 'unmerge': - return store.dispatch(refreshTimeline('home', true)); - case 'block': - return store.dispatch(refreshTimeline('mentions', true)); case 'notification': return store.dispatch(updateNotifications(JSON.parse(data.message), getMessagesForLocale(locale), locale)); } |