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 |
||
|---|---|---|
| .. | ||
| .gitkeep | ||
| 20180813113448_copy_status_stats_cleanup.rb | ||
| 20180813160548_post_migrate_filters.rb | ||
| 20181116184611_copy_account_stats_cleanup.rb | ||
| 20190511152737_remove_suspended_silenced_account_fields.rb | ||
| 20190519130537_remove_boosts_widening_audience.rb | ||
| 20190706233204_drop_stream_entries.rb | ||