mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 20:32:56 +00:00
95a1fde6b6
Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. |
||
|---|---|---|
| .. | ||
| contrast | ||
| fonts | ||
| mastodon | ||
| mastodon-light | ||
| application.scss | ||
| contrast.scss | ||
| mailer.scss | ||
| mastodon-light.scss | ||
| win95.scss | ||