tykayn aa4b715513 Merge remote-tracking branch 'glitch-soc/main' ... # Conflicts: # app/controllers/concerns/sign_in_token_authentication_concern.rb # app/javascript/mastodon/features/compose/components/action_bar.js # app/javascript/mastodon/features/compose/index.js		2022-05-10 10:17:24 +02:00
..
components	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00
containers	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +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	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00