mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-28 16:17:10 +00:00
6530f9709c
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |