mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 20:51:36 +01: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 |