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/services/follow_service.rb | |
| parent | 5e33445c5ff9ded56c2d40eb17d89ace108c3840 (diff) | |
| parent | 8e34bed7cce7b97388e55fabacee7d424b5846ea (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/services/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index cdae254bf..a57e1b28a 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -33,7 +33,6 @@ class FollowService < BaseService end FeedManager.instance.trim(:home, into_account.id) - FeedManager.instance.broadcast(into_account.id, type: 'merge') end def redis |