Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		2018-05-10 00:03:28 +02:00
..
account_serializer.rb
application_serializer.rb
context_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
instance_serializer.rb
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb
search_serializer.rb
status_serializer.rb