mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() 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 |