Claire 1cd7f5ff17 Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream ... Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.		2023-05-28 15:54:31 +02:00
..
components	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
containers	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
index.jsx	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00