Merge branch 'develop' into release

2019-11-27 15:48:03 -06:00
parent faec0bc979 fb74f59ae5
commit 45efbc1e4b
76 changed files with 1366 additions and 1353 deletions
@@ -16,7 +16,7 @@ async function updateUser (user) {

  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);

-  sendTxn(
+  await sendTxn(
    user,
    EMAIL_SLUG,
    [{ name: 'BASE_URL', content: BASE_URL }], // Add variables from template