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	[Glitch] Fix reply button on media modal not giving focus to compose form	2022-02-26 09:54:48 +01:00
index.js	[Glitch] Fix empty “Server rules violation” report option	2022-04-28 23:43:49 +02:00