mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-27 23:55:52 +00:00
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. |
||
---|---|---|
.. | ||
account_moderation_note_policy.rb | ||
account_policy.rb | ||
account_warning_policy.rb | ||
account_warning_preset_policy.rb | ||
announcement_policy.rb | ||
appeal_policy.rb | ||
application_policy.rb | ||
backup_policy.rb | ||
custom_emoji_policy.rb | ||
delivery_policy.rb | ||
domain_allow_policy.rb | ||
domain_block_policy.rb | ||
email_domain_block_policy.rb | ||
follow_recommendation_policy.rb | ||
instance_policy.rb | ||
invite_policy.rb | ||
ip_block_policy.rb | ||
poll_policy.rb | ||
preview_card_policy.rb | ||
preview_card_provider_policy.rb | ||
relay_policy.rb | ||
report_note_policy.rb | ||
report_policy.rb | ||
rule_policy.rb | ||
settings_policy.rb | ||
status_policy.rb | ||
tag_policy.rb | ||
user_policy.rb |