Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/media_attachment.rb`: Upstream moved hardcoded values around, while in glitch-soc they are configurable. Moved them like upstream, but keeping glitch-soc's ability to configure them through env vars.		2022-02-22 18:06:29 +01:00
..
core	[Glitch] Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 21:45:01 +02:00
flavours	[Glitch] Fix opening the emoji picker scrolling the single-column view to the top	2022-02-17 11:05:47 +01:00
fonts
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-19 11:33:18 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-22 18:06:29 +01:00