Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:49:42 +02:00
flavours	Fix invalid CSS for links in warning and strike cards	2022-12-14 10:11:04 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01: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-12-15 20:25:25 +01:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00