Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +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	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +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
note_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +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
update_serializer.rb
vote_serializer.rb