Merge tag 'v3.2.0' into hometown-dev

2020-08-11 13:56:04 -07:00
parent 65dc8812c9 93dd413a47
commit 52cb64a183
676 changed files with 20549 additions and 6955 deletions
--- a/app/views/application/_card.html.haml
+++ b/app/views/application/_card.html.haml
@ -13,4 +13,4 @@
          %strong.emojify.p-name= display_name(account, custom_emojify: true)
        %span
          = acct(account)
-          = fa_icon('lock') if account.locked?
+          = fa_icon('lock', { :data => ({hidden: true} unless account.locked?)})