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.		2020-06-30 23:00:20 +02:00
..
accept_follow_serializer.rb
activity_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
actor_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
add_serializer.rb
block_serializer.rb
collection_serializer.rb	Fix serialization of replies when some of them are URIs (#13957)	2020-06-04 19:03:31 +02:00
delete_actor_serializer.rb
delete_serializer.rb
device_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
emoji_serializer.rb
encrypted_message_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
flag_serializer.rb
follow_serializer.rb
image_serializer.rb
like_serializer.rb
move_serializer.rb
note_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
one_time_key_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
outbox_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
public_key_serializer.rb
reject_follow_serializer.rb
remove_serializer.rb
undo_announce_serializer.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
undo_block_serializer.rb
undo_follow_serializer.rb
undo_like_serializer.rb
update_poll_serializer.rb
update_serializer.rb
vote_serializer.rb