Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.		2022-07-05 09:33:44 +02:00
..
admin
accounts_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
application_helper.rb
branding_helper.rb
context_helper.rb
domain_control_helper.rb
email_helper.rb
flashes_helper.rb	Clean up flash display in views (#2336)	2017-04-23 04:22:34 +02:00
formatting_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb
languages_helper.rb
mascot_helper.rb
routing_helper.rb
settings_helper.rb
statuses_helper.rb
webfinger_helper.rb