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	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
filters_controller.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
media_controller.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	2020-03-08 23:56:18 +01:00
search_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 23:00:03 +02:00
suggestions_controller.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00