10a0d76bf0
Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up. |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| core | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| material-icons | ||
| packs | ||
| skins | ||
| styles | ||
| svg-icons | ||
| types | ||