Claire 69737b703a Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.

2021-05-17 10:30:34 +02:00

..

accept_follow_serializer.rb

…

activity_serializer.rb

…

actor_serializer.rb

Fix error when rendering actor with hashtags in bio (#16218)

2021-05-11 19:14:59 +02:00

add_serializer.rb

…

block_serializer.rb

…

collection_serializer.rb

…

delete_actor_serializer.rb

…

delete_serializer.rb

…

device_serializer.rb

…

emoji_serializer.rb

…

encrypted_message_serializer.rb

…

flag_serializer.rb

…

follow_serializer.rb

…

hashtag_serializer.rb

…

image_serializer.rb

…

like_serializer.rb

…

move_serializer.rb

…

note_serializer.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-05-17 10:30:34 +02:00

one_time_key_serializer.rb

…

outbox_serializer.rb

…

public_key_serializer.rb

…

reject_follow_serializer.rb

…

remove_serializer.rb

…

undo_announce_serializer.rb

…

undo_block_serializer.rb

…

undo_follow_serializer.rb

…

undo_like_serializer.rb

…

update_poll_serializer.rb

…

update_serializer.rb

…

vote_serializer.rb

…