This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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	Fix wrong colors in the high-contrast theme (#19708)	2022-11-04 02:28:14 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
mastodon-light	Fix color of the “No description added“ media upload warning on light theme (#20328)	2022-11-10 14:21:31 +01:00
application.scss	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
contrast.scss	…
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00
mastodon-light.scss	…
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00