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
..
components	Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream	2023-10-25 12:14:24 +02:00
containers	Add recent searches in web UI (#26834)	2023-09-07 14:56:19 +02:00
util	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
index.jsx	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00