diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
commit | 59864ff495cb607b4e2632b8b8ca183c1e602626 (patch) | |
tree | 7dfc6dc1fff3d8864497d0ed32aff5862b5e47e9 /app/views/admin/relationships | |
parent | 9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff) | |
parent | 67d550830b3b1a9a2b65b1ab98ea4bcd491666c5 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.
Diffstat (limited to 'app/views/admin/relationships')
-rw-r--r-- | app/views/admin/relationships/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/relationships/index.html.haml b/app/views/admin/relationships/index.html.haml index 60b9b5b25..f82cf26a3 100644 --- a/app/views/admin/relationships/index.html.haml +++ b/app/views/admin/relationships/index.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = t('admin.relationships.title', acct: @account.acct) + = t('admin.relationships.title', acct: @account.pretty_acct) .filters .filter-subset |