Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2020-01-13 17:07:39 +01:00
commit 884350f8f7

View File

@ -41,7 +41,7 @@ nThen((waitFor) => {
pinned = Pins.calculateFromLog(content.toString('utf8'), f); pinned = Pins.calculateFromLog(content.toString('utf8'), f);
})); }));
}).nThen((waitFor) => { }).nThen((waitFor) => {
Pinned.load(waitFor((d) => { Pinned.load(waitFor((err, d) => {
data = Object.keys(d); data = Object.keys(d);
}), { }), {
exclude: [edPublic + '.ndjson'] exclude: [edPublic + '.ndjson']