Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
contrast
fonts
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
mastodon-light
application.scss
contrast.scss
mailer.scss
mastodon-light.scss
win95.scss