Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +02:00
..
admin
v2
account_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
filter_serializer.rb
identity_proof_serializer.rb
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	2017-09-13 21:47:30 -05:00
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb
tag_serializer.rb
web_push_subscription_serializer.rb