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. |
||
|---|---|---|
| .. | ||
| assets.rake | ||
| auto_annotate_models.rake | ||
| branding.rake | ||
| db.rake | ||
| emojis.rake | ||
| glitchsoc.rake | ||
| mastodon.rake | ||
| repo.rake | ||
| statistics.rake | ||
| tests.rake | ||