Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc |
||
---|---|---|
.. | ||
account_actions | ||
account_moderation_notes | ||
account_warnings | ||
accounts | ||
action_logs | ||
change_emails | ||
custom_emojis | ||
dashboard | ||
domain_allows | ||
domain_blocks | ||
email_domain_blocks | ||
followers | ||
instances | ||
invites | ||
pending_accounts | ||
relays | ||
report_notes | ||
reports | ||
settings | ||
statuses | ||
tags | ||
warning_presets |