Merge branch 'master' into i18n-refactor

Conflicts:
	client/coral-sign-in/components/FakeComment.js
	client/coral-sign-in/components/UserBox.js
This commit is contained in:
Chi Vinh Le
2017-05-29 20:23:27 +07:00
174 changed files with 14458 additions and 2048 deletions
+4 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "1.6.0",
"version": "1.7.0",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js",
"scripts": {
@@ -54,10 +54,13 @@
"app-module-path": "^2.2.0",
"bcrypt": "^1.0.2",
"body-parser": "^1.17.1",
"bowser": "^1.7.0",
"cli-table": "^0.3.1",
"colors": "^1.1.2",
"commander": "^2.9.0",
"compression": "^1.6.2",
"connect-redis": "^3.1.0",
"cookie-parser": "^1.4.3",
"cross-spawn": "^5.1.0",
"csurf": "^1.9.0",
"dataloader": "^1.3.0",