Skip to content
  • tykayn's avatar
    Merge remote-tracking branch 'glitch-soc/main' · aa4b7155
    tykayn authored
    # 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
    aa4b7155