Claire 06a878c6b5 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
..
_instance.html.haml	Add tooltip for instance delivery warnings (#17854)	2022-03-22 18:41:46 +01:00
index.html.haml	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00