mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 16:58:06 +01: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. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||