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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		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	…
emoji_serializer.rb	…
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	5 years ago
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	…