mirror of https://framagit.org/tykayn/mastodon.git
f224237862
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's. |
||
|---|---|---|
| .. | ||
| trends | ||
| account_moderation_notes_helper.rb | ||
| action_logs_helper.rb | ||
| announcements_helper.rb | ||
| dashboard_helper.rb | ||
| filter_helper.rb | ||
| settings_helper.rb | ||