mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 12:00:13 -05: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. |
||
---|---|---|
.. | ||
rules | ||
configuration.js | ||
development.js | ||
production.js | ||
shared.js | ||
tests.js |