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
..
rules	Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream	2023-10-25 12:14:24 +02:00
configuration.js	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
development.js	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
production.js	Use NodeJS v20 by default (#26830)	2023-09-08 13:45:34 +02:00
shared.js	Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream	2023-08-24 21:26:27 +02:00
tests.js	Add end-to-end (system) tests (#25461)	2023-07-28 23:09:49 +02:00