Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| branding.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| spec.rake | ||
| statistics.rake | ||
| tests.rake | ||