mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
f8e07ca5cd
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). |
||
---|---|---|
.. | ||
.gitkeep | ||
20180813113448_copy_status_stats_cleanup.rb | ||
20180813160548_post_migrate_filters.rb | ||
20181116184611_copy_account_stats_cleanup.rb |