mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
980c004f06
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one |
||
---|---|---|
.. | ||
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 |