Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| contrast | ||
| fonts | ||
| mastodon | ||
| mastodon-light | ||
| application.scss | ||
| contrast.scss | ||
| mailer.scss | ||
| mastodon-light.scss | ||
| win95.scss | ||