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 77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	Gemfile.lock
2018-05-04 09:42:31 -05:00
..
account_moderation_notes
accounts Feature: add count of account notes to reports (#7130) 2018-04-17 14:58:11 +02:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
change_emails
custom_emojis
domain_blocks
email_domain_blocks
instances
invites
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-04 09:42:31 -05:00
settings
statuses
subscriptions