Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit.		2022-05-16 09:42:32 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
flavours	Use upstream's settings for CW auto-expand and column swiping (#1770)	2022-05-15 17:30:40 +02:00
fonts
images	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +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-11 09:37:48 +02:00