mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 14:56:27 +00:00
694c073d1f
Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. |
||
---|---|---|
.. | ||
account_actions_controller.rb | ||
account_moderation_notes_controller.rb | ||
accounts_controller.rb | ||
action_logs_controller.rb | ||
announcements_controller.rb | ||
base_controller.rb | ||
change_emails_controller.rb | ||
confirmations_controller.rb | ||
custom_emojis_controller.rb | ||
dashboard_controller.rb | ||
domain_allows_controller.rb | ||
domain_blocks_controller.rb | ||
email_domain_blocks_controller.rb | ||
follow_recommendations_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
ip_blocks_controller.rb | ||
pending_accounts_controller.rb | ||
relationships_controller.rb | ||
relays_controller.rb | ||
report_notes_controller.rb | ||
reported_statuses_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
rules_controller.rb | ||
settings_controller.rb | ||
sign_in_token_authentications_controller.rb | ||
site_uploads_controller.rb | ||
statuses_controller.rb | ||
subscriptions_controller.rb | ||
tags_controller.rb | ||
two_factor_authentications_controller.rb | ||
warning_presets_controller.rb |