Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.		2023-07-30 13:49:35 +02:00
..
accept_follow_serializer.rb
activity_serializer.rb
actor_serializer.rb	Use username as display name for suspended users or users with blank display names (#25276)	2023-07-21 13:20:53 +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