Merge tag 'v2.9.3' into hometown-2.9.3

2019-08-19 14:28:19 -07:00
parent f66e192c2e 06f906acac
commit 6c2e2969ca
98 changed files with 852 additions and 270 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -588,6 +588,8 @@ en:
    people:
      one: "%{count} person"
      other: "%{count} people"
+  domain_validator:
+    invalid_domain: is not a valid domain name
  errors:
    '403': You don't have permission to view this page.
    '404': The page you are looking for isn't here.