Merge branch 'cpnetflux' into mailbox

6 years ago · d3af840f81
parent ce2d0d5b83 909e70905c
commit d3af840f81
1 changed files with 2 additions and 0 deletions
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@ -1071,6 +1071,8 @@ define([
                },
                onConnectionChange: function () {},
                crypto: {
                    // The encryption and decryption is done in the outer window.
                    // This async-store only deals with already encrypted messages.
                    encrypt: function (m) { return m; },
                    decrypt: function (m) { return m; }
                },