395b9011ee
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| account_actions | ||
| account_warnings | ||
| accounts | ||
| action_logs | ||
| announcements | ||
| change_emails | ||
| custom_emojis | ||
| dashboard | ||
| disputes/appeals | ||
| domain_allows | ||
| domain_blocks | ||
| email_domain_blocks | ||
| export_domain_allows | ||
| export_domain_blocks | ||
| follow_recommendations | ||
| instances | ||
| invites | ||
| ip_blocks | ||
| relationships | ||
| relays | ||
| report_notes | ||
| reports | ||
| roles | ||
| rules | ||
| settings | ||
| software_updates | ||
| status_edits | ||
| statuses | ||
| tags | ||
| trends | ||
| users/roles | ||
| warning_presets | ||
| webhooks | ||