mirror of https://framagit.org/tykayn/mastodon.git
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 | ||
| settings | ||
| users | ||
| account_moderation_notes_controller_spec.rb | ||
| accounts_controller_spec.rb | ||
| action_logs_controller_spec.rb | ||
| base_controller_spec.rb | ||
| change_email_controller_spec.rb | ||
| confirmations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| dashboard_controller_spec.rb | ||
| domain_allows_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| email_domain_blocks_controller_spec.rb | ||
| export_domain_allows_controller_spec.rb | ||
| export_domain_blocks_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| invites_controller_spec.rb | ||
| report_notes_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| resets_controller_spec.rb | ||
| roles_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| tags_controller_spec.rb | ||