This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/admin
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
..
account_moderation_notes
accounts
action_logs
custom_emojis
domain_blocks
email_domain_blocks
instances
invites
reports
settings
statuses
subscriptions