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	Fix backend terms link not being used	2022-05-03 11:10:58 +02:00
index.js	[Glitch] Rename toots to posts in various places, add or reword DM warnings	2022-05-03 10:59:23 +02:00