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

2022-05-08 21:00:49 +02:00
parent d7eae4229c f17e73da09
commit 22080786df
138 changed files with 4394 additions and 1134 deletions
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@ -65,6 +65,6 @@
      - elsif status.private_visibility? || status.limited_visibility?
        = fa_icon 'lock fw'
      - else
-        = fa_icon 'envelope fw'
+        = fa_icon 'at fw'
    = link_to remote_interaction_path(status, type: :favourite), class: 'status__action-bar-button icon-button modal-button' do
      = fa_icon 'star fw'