mirror of https://github.com/tootsuite/mastodon
249991c498
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml |
||
---|---|---|
.. | ||
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 |