Merge branch 'develop' into feature/add-an-option-for-a-default-formatting

2019-02-06 14:28:50 -05:00 · 2019-02-06 14:28:50 -05:00 · e107ed8ddc
commit e107ed8ddc
parent 460976c6e5 6cca15bade
3 changed files with 21 additions and 1 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -28,7 +28,8 @@
    "password": "Password",
    "placeholder": "e.g. lain",
    "register": "Register",
-    "username": "Username"
+    "username": "Username",
+    "hint": "Log in to join discussion"
  },
  "nav": {
    "about": "About",