eb39db7f93
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
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 |