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

8 lines

392 B

XML

Executable File

Raw Blame History