Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-24 19:17:11 +00:00
parent 1b4d79acf8 a3c0a20373
commit 0e10667fbe
91 changed files with 728 additions and 238 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -165,7 +165,7 @@ class Account < ApplicationRecord

  def refresh!
    return if local?
-    ResolveRemoteAccountService.new.call(acct)
+    ResolveAccountService.new.call(acct)
  end

  def unsuspend!