mastodon/app/views/admin
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
..
account_actions
account_moderation_notes
account_warnings
accounts
action_logs
change_emails
custom_emojis Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
domain_allows Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
domain_blocks
email_domain_blocks
followers
instances
invites
pending_accounts
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
statuses
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-10-03 11:10:12 +02:00
warning_presets