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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		6 years ago
..
v2	…
account_serializer.rb	…
application_serializer.rb	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
context_serializer.rb	…
conversation_serializer.rb	…
credential_account_serializer.rb	…
custom_emoji_serializer.rb	…
filter_serializer.rb	…
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
list_serializer.rb	…
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
poll_serializer.rb	Add polls (#10111)	6 years ago
preview_card_serializer.rb	…
relationship_serializer.rb	…
report_serializer.rb	…
scheduled_status_serializer.rb	Fix wrong param name in scheduled statuses and return params in API (#9725)	6 years ago
search_serializer.rb	…
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	…