tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
d4dcbe64d0
mastodon/public/emoji/1f4ac_border.svg
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

14 lines
1023 B
XML
Executable File
Raw Blame History