mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-10-19 14:04:27 +00:00
b368c75029
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did. |
||
---|---|---|
.. | ||
account_actions | ||
account_warnings | ||
accounts | ||
action_logs | ||
announcements | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
disputes/appeals | ||
domain_allows | ||
domain_blocks | ||
email_domain_blocks | ||
follow_recommendations | ||
instances | ||
invites | ||
ip_blocks | ||
relationships | ||
relays | ||
report_notes | ||
reports | ||
rules | ||
settings | ||
statuses | ||
tags | ||
trends | ||
warning_presets |