mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-03 12:03:57 +00:00
00fcdebed7
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting. |
||
---|---|---|
.. | ||
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 | ||
suspensions |