You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
account_serializer.rb	Bot nameplates (#7391)	7 years ago
application_serializer.rb	…
context_serializer.rb	…
credential_account_serializer.rb	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)	7 years ago
custom_emoji_serializer.rb	…
instance_serializer.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
list_serializer.rb	Display list column (#5750)	7 years ago
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
preview_card_serializer.rb	Add embed_url to preview cards (#5775)	7 years ago
relationship_serializer.rb	Break out nested relationship API keys (#5887)	7 years ago
report_serializer.rb	…
search_serializer.rb	…
status_serializer.rb	Add backend support for bookmarks	7 years ago
web_push_subscription_serializer.rb	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago