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 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.		6 years ago
..
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	squashed identity proof updates (#10375)	6 years ago
instance_serializer.rb	…
list_serializer.rb	…
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
poll_serializer.rb	Add support for custom emojis in poll options (#10322)	6 years ago
preferences_serializer.rb	…
preview_card_serializer.rb	…
relationship_serializer.rb	Improve blocked view of profiles (#10491)	6 years ago
report_serializer.rb	…
scheduled_status_serializer.rb	…
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	…