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/ws2p_client_limitations.ts
+++ b/test/integration/ws2p_client_limitations.ts
--- a/test/integration/ws2p_cluster.ts
+++ b/test/integration/ws2p_cluster.ts
--- a/test/integration/ws2p_connection.ts
+++ b/test/integration/ws2p_connection.ts
--- a/test/integration/ws2p_doc_sharing.ts
+++ b/test/integration/ws2p_doc_sharing.ts
--- a/test/integration/ws2p_docpool.ts
+++ b/test/integration/ws2p_docpool.ts
--- a/test/integration/ws2p_exchange.ts
+++ b/test/integration/ws2p_exchange.ts
--- a/test/integration/ws2p_heads.ts
+++ b/test/integration/ws2p_heads.ts
--- a/test/integration/ws2p_network.ts
+++ b/test/integration/ws2p_network.ts
--- a/test/integration/ws2p_pulling.ts
+++ b/test/integration/ws2p_pulling.ts
--- a/test/integration/ws2p_server_limitations.ts
+++ b/test/integration/ws2p_server_limitations.ts
--- a/yarn.lock
+++ b/yarn.lock