Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.

2019-08-30 13:38:41 +02:00

..

admin

…

v2

…

account_serializer.rb

…

application_serializer.rb

…

context_serializer.rb

…

conversation_serializer.rb

…

credential_account_serializer.rb

…

custom_emoji_serializer.rb

…

filter_serializer.rb

…

identity_proof_serializer.rb

…

instance_serializer.rb

…

list_serializer.rb

…

media_attachment_serializer.rb

…

mute_serializer.rb

…

notification_serializer.rb

…

poll_serializer.rb

…

preferences_serializer.rb

…

preview_card_serializer.rb

…

relationship_serializer.rb

…

report_serializer.rb

…

scheduled_status_serializer.rb

…

search_serializer.rb

…

status_serializer.rb

…

tag_serializer.rb

…

web_push_subscription_serializer.rb

…