mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-02 13:00:28 -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. |
||
---|---|---|
.. | ||
babel.js | ||
css.js | ||
file.js | ||
index.js | ||
mark.js | ||
material_icons.js | ||
node_modules.js | ||
tesseract.js |