mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-30 05:59:58 +00:00
8c26d49cbd
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream fixed a translation bug in the theme selector that is absent from glitch-soc due to our different theming system. Discarded upstream changes. - `streaming/index.js`: Upstream changed the signature of a function to change its return type. This is not a real conflict, the conflict being caused by an extra argument in glitch-soc's code. Applied upstream's change while keeping our extra argument. |
||
---|---|---|
.. | ||
disputes | ||
reports | ||
settings | ||
trends | ||
users | ||
webhooks | ||
account_actions_controller.rb | ||
account_moderation_notes_controller.rb | ||
accounts_controller.rb | ||
action_logs_controller.rb | ||
announcements_controller.rb | ||
base_controller.rb | ||
change_emails_controller.rb | ||
confirmations_controller.rb | ||
custom_emojis_controller.rb | ||
dashboard_controller.rb | ||
domain_allows_controller.rb | ||
domain_blocks_controller.rb | ||
email_domain_blocks_controller.rb | ||
export_domain_allows_controller.rb | ||
export_domain_blocks_controller.rb | ||
follow_recommendations_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
ip_blocks_controller.rb | ||
relationships_controller.rb | ||
relays_controller.rb | ||
report_notes_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
rules_controller.rb | ||
settings_controller.rb | ||
site_uploads_controller.rb | ||
statuses_controller.rb | ||
tags_controller.rb | ||
warning_presets_controller.rb | ||
webhooks_controller.rb |