Claire 4415005de7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.		2022-05-16 22:29:05 +02:00
..
core	Add confirmation page when importing blocked domains (#1773)	2022-05-16 18:26:49 +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 22:29:05 +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-16 22:29:05 +02:00