mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 22:29:07 +09:00
b0c76eaadd
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 |