Merge branch 'master' into token-fix

This commit is contained in:
Kim Gardner authored and GitHub committed 2018-07-27 21:12:52 +01:00
commit eb4bcb71c4
2 files changed
+2 -4

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "4.5.1",
"version": "4.6.0",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js",
"private": true,
+1 -3
View File
@@ -84,9 +84,7 @@ async function upsertUser(
status: {
username: {
status: usernameStatus,
history: {
status: usernameStatus,
},
history: [{ status: usernameStatus }],
},
},
});