Merge branch 'staging' into trim-history

2020-01-15 15:46:35 -05:00
parent ff40538ee7 33fe090dcf
commit 6a52b97cd8
26 changed files with 549 additions and 121 deletions
--- a/scripts/check-account-deletion.js
+++ b/scripts/check-account-deletion.js
@@ -41,7 +41,7 @@ nThen((waitFor) => {
        pinned = Pins.calculateFromLog(content.toString('utf8'), f);
    }));
 }).nThen((waitFor) => {
-    Pinned.load(waitFor((d) => {
+    Pinned.load(waitFor((err, d) => {
        data = Object.keys(d);
    }), {
        exclude: [edPublic + '.ndjson']