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 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		4 years ago
..
contrast	…
fonts	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
mastodon-light	…
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…