Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: Gemfile.lock
2018-05-04 09:42:31 -05:00
parent c511b0f72a 251bbf9728
commit 77a92d3260
6 changed files with 14 additions and 6 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -376,6 +376,7 @@ en:
  admin_mailer:
    new_report:
      body: "%{reporter} has reported %{target}"
+      body_remote: Someone from %{domain} has reported %{target}
      subject: New report for %{instance} (#%{id})
  application_mailer:
    notification_preferences: Change e-mail preferences