Merge branch 'staging' into newdrive

2017-09-25 17:35:06 +02:00
parent d2f1d0c0e9 a8eecee590
commit cdeac00633
19 changed files with 105 additions and 92 deletions
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -259,7 +259,7 @@ define([
                    if (msg) {
                        msg = msg.replace(/^cp\|/, '');
                        var decryptedMsg = crypto.decrypt(msg, secret.keys.validateKey);
-                        msgs.push(decryptedMsg)
+                        msgs.push(decryptedMsg);
                    }
                };
                network.on('message', onMsg);