Merge tag 'v3.2.0' into instance_only_statuses

2020-07-27 22:21:35 +02:00
parent 06b6353483 93dd413a47
commit 8126ac030e
675 changed files with 20547 additions and 6951 deletions
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@ -18,7 +18,7 @@
        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}")

    .actions
-      %button= t('admin.accounts.search')
+      %button.button= t('admin.accounts.search')
      = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'

 - @reports.group_by(&:target_account_id).each do |target_account_id, reports|