Jeremy Kescher 1c9291adcd Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/styles/components/accounts.scss # app/javascript/flavours/glitch/styles/components/status.scss		2024-02-14 18:02:38 +01:00
..
glitch	Merge branch 'glitch-soc' into develop	2024-02-14 18:02:38 +01:00
vanilla	Remove redundant asset preload (#2488)	2023-12-02 14:54:26 +01:00