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
..
glitch	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00
vanilla	Fix missing javascript in some admin pages	2022-02-12 00:10:28 +01:00