Claire b6b68b44a1 Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream ...

Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.

2023-08-24 21:46:17 +02:00

..

accept_follow_serializer.rb

…

activity_serializer.rb

…

actor_serializer.rb

Add support for federating memorial attribute (#26583)

2023-08-23 08:27:24 +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

…

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

…