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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
admin	Add moderation API (#9387)	6 years ago
v2	…
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_serializer.rb	…
context_serializer.rb	…
conversation_serializer.rb	…
credential_account_serializer.rb	…
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	6 years ago
filter_serializer.rb	…
identity_proof_serializer.rb	…
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
list_serializer.rb	…
media_attachment_serializer.rb	Add blurhash (#10630)	6 years ago
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	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	Fix `alerts` booleans not being typecast correctly in push subscription (#11343)	5 years ago