mirror of https://github.com/tootsuite/mastodon
3e686beaea
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it. |
||
---|---|---|
.. | ||
account_actions | ||
account_moderation_notes | ||
account_warnings | ||
accounts | ||
action_logs | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
domain_blocks | ||
email_domain_blocks | ||
instances | ||
invites | ||
relays | ||
report_notes | ||
reports | ||
settings | ||
statuses | ||
subscriptions | ||
tags | ||
warning_presets |