Merge branch '1.6' into dev

3d6edb1a · Éloïs · 9d1df3f0 · efe8992f · 3d6edb1a · 3d6edb1a
Commit 3d6edb1a authored 7 years ago by Éloïs
--- a/test/integration/continuous-proof.js
+++ b/test/integration/continuous-proof.js
--- a/test/integration/crosschain-test.js
+++ b/test/integration/crosschain-test.js
--- a/test/integration/documents-currency.ts
+++ b/test/integration/documents-currency.ts
--- a/test/integration/forwarding.ts
+++ b/test/integration/forwarding.ts
--- a/test/integration/http_api.js
+++ b/test/integration/http_api.js
--- a/test/integration/identity-absorption.js
+++ b/test/integration/identity-absorption.js
--- a/test/integration/identity-clean-test.js
+++ b/test/integration/identity-clean-test.js
--- a/test/integration/identity-expiry.js
+++ b/test/integration/identity-expiry.js
--- a/test/integration/identity-implicit-revocation.js
+++ b/test/integration/identity-implicit-revocation.js
--- a/test/integration/identity-kicking-by-certs.js
+++ b/test/integration/identity-kicking-by-certs.js
--- a/test/integration/identity-kicking.js
+++ b/test/integration/identity-kicking.js
--- a/test/integration/identity-pulling.js
+++ b/test/integration/identity-pulling.js
--- a/test/integration/identity-same-pubkey.js
+++ b/test/integration/identity-same-pubkey.js
--- a/test/integration/identity-test.js
+++ b/test/integration/identity-test.js
--- a/test/integration/lookup.js
+++ b/test/integration/lookup.js
--- a/test/integration/membership_chainability.ts
+++ b/test/integration/membership_chainability.ts
--- a/test/integration/network-update.js
+++ b/test/integration/network-update.js
--- a/test/integration/network.js
+++ b/test/integration/network.js
--- a/test/integration/newcomers-shuffling.js
+++ b/test/integration/newcomers-shuffling.js
--- a/test/integration/peer-outdated.js
+++ b/test/integration/peer-outdated.js