Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
flavours	[Glitch] Fix empty “Server rules violation” report option	2022-04-28 23:43:49 +02:00
fonts
images	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
packs	Pre-fill domain block/allow domain from search filter (#18172)	2022-04-29 00:24:44 +02: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-05-01 16:52:27 +02:00