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

2019-12-01 12:12:42 +01:00
parent 7f6315841c d70268f099
commit 99f1f48741
15 changed files with 116 additions and 20 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -406,6 +406,7 @@ en:
      are_you_sure: Are you sure?
      assign_to_self: Assign to me
      assigned: Assigned moderator
+      by_target_domain: Domain of reported account
      comment:
        none: None
      created_at: Reported
@ -938,6 +939,8 @@ en:
  relationships:
    activity: Account activity
    dormant: Dormant
+    followers: Followers
+    following: Following
    last_active: Last active
    most_recent: Most recent
    moved: Moved