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
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 22:29:05 +02:00
containers	Add language dropdown to compose in web UI (#18420)	2022-05-16 11:18:35 +02:00
util	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)	2021-03-02 12:02:56 +01:00
index.js	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +02:00