forked from treehouse/mastodon
c56a504d11
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes. |
||
---|---|---|
.. | ||
account_actions | ||
account_moderation_notes | ||
account_warnings | ||
accounts | ||
action_logs | ||
announcements | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
domain_allows | ||
domain_blocks | ||
email_domain_blocks | ||
instances | ||
invites | ||
pending_accounts | ||
relationships | ||
relays | ||
report_notes | ||
reports | ||
settings | ||
statuses | ||
tags | ||
warning_presets |