Merge branch 'develop' into feature/replace-panel-switcher

2018-12-22 17:32:35 +02:00 · 2018-12-22 17:32:35 +02:00 · f72b1d048e
commit f72b1d048e
parent 4836c8ac74 e59b67e119
15 changed files with 40 additions and 64 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -75,6 +75,8 @@
    "password_confirm": "Password confirmation",
    "registration": "Registration",
    "token": "Invite token",
+    "captcha": "CAPTCHA",
+    "new_captcha": "Click the image to get a new captcha",
    "validations": {
      "username_required": "cannot be left blank",
      "fullname_required": "cannot be left blank",