diff options
| author | ThibG <thib@sitedethib.com> | 2018-09-03 17:40:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 17:40:03 +0200 |
| commit | 174548f3bd0f1d42a28a5c501aad7116f18eaddb (patch) | |
| tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /config/locales/simple_form.en.yml | |
| parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
| parent | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (diff) | |
Merge pull request #702 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 2f0e40f66..c9ac42f5d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -93,6 +93,7 @@ en: follow_request: Send e-mail when someone requests to follow you mention: Send e-mail when someone mentions you reblog: Send e-mail when someone boosts your status + report: Send e-mail when a new report is submitted 'no': 'No' required: mark: "*" |