mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-11 05:00:35 +00:00
bf1d3ae3b8
Conflicts: config/settings.yml |
||
---|---|---|
.. | ||
account_moderation_notes | ||
accounts | ||
action_logs | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
domain_blocks | ||
email_domain_blocks | ||
instances | ||
invites | ||
relays | ||
report_notes | ||
reports | ||
settings | ||
statuses | ||
subscriptions |