Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| branding.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| icons.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| spec.rake | ||
| statistics.rake | ||
| tests.rake | ||
| webpacker.rake | ||