Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		2021-04-20 12:17:14 +02:00
..
contrast
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
mastodon-light	Fixing the hero widget (#15926)	2021-03-19 20:23:32 +01:00
application.scss
contrast.scss
mailer.scss	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00
mastodon-light.scss
win95.scss