Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream ... 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.		2023-10-25 12:14:24 +02:00
..
babel.js	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
css.js	…
file.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
index.js	Change design of role badges in web UI (#26281)	2023-08-02 17:24:32 +02:00
mark.js	…
material_icons.js	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00
node_modules.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
tesseract.js	…