Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
mastodon-light	Replace from Code Climate to Super-Linter (#18587)	2022-06-01 19:22:35 +02:00
application.scss	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +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