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		2019-09-30 12:23:57 +02:00
..
accept_follow_serializer.rb
activity_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
actor_serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00
add_serializer.rb
block_serializer.rb
collection_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
delete_actor_serializer.rb
delete_serializer.rb
emoji_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	2019-07-10 00:43:30 +02:00
flag_serializer.rb
follow_serializer.rb
image_serializer.rb
like_serializer.rb
move_serializer.rb	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
note_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
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	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02:00
update_serializer.rb
vote_serializer.rb