Merge branch 'master' into staging

2018-04-27 17:51:12 +02:00
parent b21f42747d 41583b7858
commit 009eb13fc3
5 changed files with 63 additions and 4 deletions
--- a/www/common/outer/chainpad-netflux-worker.js
+++ b/www/common/outer/chainpad-netflux-worker.js
@@ -68,7 +68,7 @@ define([], function () {

        // shim between chainpad and netflux
        var msgIn = function (peerId, msg) {
-            return msg.replace(/^cp\|/, '');
+            return msg.replace(/^cp\|([A-Za-z0-9+\/=]+\|)?/, '');
        };

        var msgOut = function (msg) {