mastodon/app/views/admin
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +02:00
..
account_actions
account_moderation_notes
account_warnings
accounts Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
action_logs
change_emails
custom_emojis
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
domain_allows Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks
email_domain_blocks
followers
instances Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
invites
pending_accounts
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +02:00
statuses
tags
warning_presets