You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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`		2 years ago
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mastodon-light	Fix color of the “No description added“ media upload warning on light theme (#20328)	2 years ago
application.scss	Change public accounts pages to mount the web UI (#19319)	2 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	3 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Update win95 style from cybre.space	3 years ago