This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/serializers/rest
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
account_serializer.rb
application_serializer.rb
context_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
instance_serializer.rb
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
search_serializer.rb
status_serializer.rb
web_push_subscription_serializer.rb