Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream changed one import, close to a glitch-soc-only import to handle different max character counts. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||