Merge branch 'master' into glitch-soc/merge-upstream

2020-02-06 21:36:38 +01:00
parent ccaefd139d aeb6efbb03
commit 1a54b9b99e
156 changed files with 1830 additions and 544 deletions
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -147,7 +147,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
    end

    def acct
-      object.account_acct
+      object.account.pretty_acct
    end
  end