mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 23:24:55 +01:00
280d7b1df8
Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes). |
||
---|---|---|
.. | ||
.gitkeep | ||
20180813113448_copy_status_stats_cleanup.rb | ||
20180813160548_post_migrate_filters.rb |