diff options
| author | Kai Schaper <303@posteo.de> | 2016-10-20 17:35:05 +0200 |
|---|---|---|
| committer | Kai Schaper <303@posteo.de> | 2016-10-20 17:35:05 +0200 |
| commit | 4b0e3eb1fbc462ee873ad5a996cca25e361ec9fa (patch) | |
| tree | 557bea513320b8d6970604c75aab4cac58c7ea85 /app/assets/javascripts/components/containers/mastodon.jsx | |
| parent | 19cfe64455d805e7c21a4176256cc3e72d062d0b (diff) | |
| parent | 04bbc576906ff70feed7d42fef0e6db17fdd9ed3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
| -rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index 4eb9f83c8..8e1becbda 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -54,9 +54,9 @@ const Mastodon = React.createClass({ return store.dispatch(deleteFromTimelines(data.id)); case 'merge': case 'unmerge': - return store.dispatch(refreshTimeline('home')); + return store.dispatch(refreshTimeline('home', true)); case 'block': - return store.dispatch(refreshTimeline('mentions')); + return store.dispatch(refreshTimeline('mentions', true)); } } |