Merge branch 'master' into eslint-react

This commit is contained in:
Wyatt Johnson authored and GitHub committed 2017-09-14 08:33:42 -06:00
commit 6a4a0b7f6b
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -56,7 +56,7 @@ yarn build
## Running
Refer to the `README.md` file for required configuration variables to add to the
Refer to the [configuration](https://coralproject.github.io/talk/docs/running/configuration/) page for required configuration variables to add to the
environment.
You can start the server after configuring the server using the command:
+1 -1
View File
@@ -322,7 +322,7 @@ en:
to_access: "to access Profile"
user_no_comment: "You've never left a comment. Join the conversation!"
stream:
temporarily_suspended: "In accordance with {0}'s community guidlines, your account has been temporarily suspended. Please rejoin the conversation {1}."
temporarily_suspended: "In accordance with {0}'s community guidelines, your account has been temporarily suspended. Please rejoin the conversation {1}."
step_1_header: "Report an issue"
step_2_header: "Help us understand"
step_3_header: "Thank you for your input"