mirror of https://github.com/tootsuite/mastodon
16d5217502
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json |
||
---|---|---|
.. | ||
account_moderation_notes | ||
accounts | ||
action_logs | ||
change_emails | ||
custom_emojis | ||
domain_blocks | ||
email_domain_blocks | ||
instances | ||
invites | ||
report_notes | ||
reports | ||
settings | ||
statuses | ||
subscriptions |