Claire a482932649 Merge commit '6f7615ba86' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.		2024-02-27 19:20:57 +01:00
..
components	Merge commit '6f7615ba86' into glitch-soc/merge-upstream	2024-02-27 19:20:57 +01:00
containers	Fix pixel alignment for some composer icons (#29372)	2024-02-23 15:32:13 +00:00
util	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
index.jsx	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00