You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 1a853d7caa 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.		3 years ago
..
core	Add confirmation page when importing blocked domains (#1773)	3 years ago
flavours	Use upstream's settings for CW auto-expand and column swiping (#1770)	3 years ago
fonts	…
images	Update win95 style from cybre.space	3 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
packs	Pre-fill domain block/allow domain from search filter (#18172)	3 years ago
skins	Glitchsoc translation to 'es' language (#1439)	4 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago