c816701550
Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml |
||
|---|---|---|
| .. | ||
| 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 | ||