Claire ef3d15554b Merge commit 'c645490d55' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
components	Merge commit 'c645490d55' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
containers	Change compose form to use server-provided post character limit (#28928)	2024-01-26 14:09:45 +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