mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-11 01:12:12 -05:00
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.