mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
---|---|---|
.. | ||
bookmarks_controller.rb | ||
favourited_by_accounts_controller.rb | ||
favourites_controller.rb | ||
mutes_controller.rb | ||
pins_controller.rb | ||
reblogged_by_accounts_controller.rb | ||
reblogs_controller.rb |