mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 05:39:02 +09:00
64b2c712d4
Conflicts: - `app/helpers/theme_helper.rb`: Conflict because upstream refactored theme-related code, and glitch-soc has a different theming system. |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
inert.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |