Merge branch 'gs-master' into glitch-theme

2017-12-04 11:07:01 -06:00
parent 1c74ede69e f2f2f10320
commit d9800a5647
214 changed files with 5378 additions and 1033 deletions
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -31,10 +31,12 @@ en:
        data: Data
        display_name: Display name
        email: E-mail address
+        expires_in: Expire after
        filtered_languages: Filtered languages
        header: Header
        locale: Language
        locked: Lock account
+        max_uses: Max number of uses
        new_password: New password
        note: Bio
        otp_attempt: Two-factor code