Jeremy Kescher 2cb88f5baa Merge remote-tracking branch 'upstream/main' into develop ... Conflicts: - .github/workflows/build-image.yml We don't use GitHub Actions for building Docker images. - Gemfile.lock Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.		2023-03-19 01:57:28 +01:00
..
components	Merge remote-tracking branch 'upstream/main' into develop	2023-03-15 14:13:29 +01:00
containers	Fix reply button on media modal not giving focus to compose form (#17626)	2022-02-25 00:51:01 +01:00
util	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
index.jsx	Merge remote-tracking branch 'upstream/main' into develop	2023-03-19 01:57:28 +01:00