Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.		2021-08-09 23:25:49 +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
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-09 23:25:49 +02:00
mastodon-light	Fixing the hero widget (#15926)	2021-03-19 20:23:32 +01:00
application.scss
contrast.scss
mailer.scss	Remove duplicate CSS properties (#16278)	2021-05-19 23:51:52 +02:00
mastodon-light.scss
win95.scss