mirror of
https://github.com/funamitech/mastodon
synced 2024-12-02 16:58:53 +09:00
48b8a1f414
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes. |
||
|---|---|---|
| .. | ||
| core | ||
| flavours | ||
| fonts | ||
| images | ||
| locales | ||
| mastodon | ||
| packs | ||
| skins | ||
| styles | ||