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
..
components	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
containers	Add language dropdown to compose in web UI (#18420)	3 years ago
util	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)	4 years ago
index.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	3 years ago