mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-07 23:44:33 +00:00
90528f43bc
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream. |
||
|---|---|---|
| .. | ||
| 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 | ||
| ip_blocks | ||
| pending_accounts | ||
| relationships | ||
| relays | ||
| report_notes | ||
| reports | ||
| settings | ||
| statuses | ||
| tags | ||
| warning_presets | ||