Files
mastodon/db/migrate
kyori19 e7eab1a6ae Merge remote-tracking branch 'tootsuite/main' into custom/quote
# Conflicts:
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/features/status/components/detailed_status.js
#	app/serializers/rest/instance_serializer.rb
2021-10-12 16:53:07 +00:00
..
2017-11-18 00:16:48 +01:00