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 f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
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
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
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