Claire 085a1197da Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.		2023-06-10 16:22:14 +02:00
..
components	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
follows.jsx	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
index.jsx	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream	2023-06-10 16:22:14 +02:00
share.jsx	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00