mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-30 16:41:55 +00:00
5e11f3a6e1
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. |
||
---|---|---|
.. | ||
contrast | ||
fonts | ||
mastodon | ||
mastodon-light | ||
application.scss | ||
contrast.scss | ||
mailer.scss | ||
mastodon-light.scss | ||
win95.scss |