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	…
application_serializer.rb	…
context_serializer.rb	…
credential_account_serializer.rb	…
custom_emoji_serializer.rb	…
instance_serializer.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
list_serializer.rb	…
media_attachment_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	7 years ago
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	…