20fb459dee
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. |
||
|---|---|---|
| .. | ||
| account_action.rb | ||
| action_log.rb | ||
| action_log_filter.rb | ||
| appeal_filter.rb | ||
| import.rb | ||
| status_batch_action.rb | ||
| status_filter.rb | ||