Merge branch 'cpnetflux' into mailbox

This commit is contained in:
yflory 2019-05-16 15:58:35 +02:00
commit d3af840f81

View File

@ -1071,6 +1071,8 @@ define([
}, },
onConnectionChange: function () {}, onConnectionChange: function () {},
crypto: { 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; }, encrypt: function (m) { return m; },
decrypt: function (m) { return m; } decrypt: function (m) { return m; }
}, },