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 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		5 years ago
..
accept_follow_serializer.rb	…
activity_serializer.rb	…
actor_serializer.rb	…
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	…
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	…