mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-26 09:32:57 -05:00
f513317ba2
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.