Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.		2023-02-03 19:23:27 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
flavours	New translations en.json (German) (#2097)	2023-01-28 10:20:55 +01:00
fonts
icons
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
skins
styles	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-25 17:26:38 +01:00