mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-04 14:04:39 +00:00
0ad919b192
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version. |
||
|---|---|---|
| .. | ||
| 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 | ||