mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 07:09:03 +09:00
ba527c071f
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.jsx |