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

diff --cc app/controllers/admin/dashboard_controller.rb
Simple merge

diff --cc app/controllers/remote_interaction_controller.rb
Simple merge

diff --cc app/views/admin/dashboard/index.html.haml
Simple merge

diff --cc app/views/admin/domain_blocks/new.html.haml
Simple merge

diff --cc config/locales/en.yml
index 6b6b996836a8b252d29cb18ed1dc40fc9745278a,7fd0536ae471b37e189fcc840186938a1e9ff1df..5fc166f4ccee4b2ffa7f64e41d2137fdc00d8124
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -259,8 -259,9 +259,10 @@@ en
        feature_timeline_preview: Timeline preview
        features: Features
        hidden_service: Federation with hidden services
 +      keybase: Keybase integration
        open_reports: open reports
+       pending_tags: hashtags waiting for review
+       pending_users: users waiting for review
        recent_users: Recent users
        search: Full-text search
        single_user_mode: Single user mode

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge