Conflicts: - `.env.production.sample`: Upstream and glitch-soc had different comments, some comments got updated upstream. Updated them in glitch-soc accordingly. |
||
|---|---|---|
| .. | ||
| contrast | ||
| fonts | ||
| mastodon | ||
| mastodon-light | ||
| application.scss | ||
| contrast.scss | ||
| inert.scss | ||
| mailer.scss | ||
| mastodon-light.scss | ||
| win95.scss | ||