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 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		4 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	…
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	…