Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
ansuz committed 2019-09-03 18:08:11 +02:00
commit cdb98ee27f
4 files changed
+55 -49

No files matched your search

+1
View File
@@ -343,6 +343,7 @@ proxy.mailboxes = {
try {
var decrypted = box.encryptor.decrypt(_msg[4]);
message = JSON.parse(decrypted.content);
message.author = decrypted.author;
} catch (e) {
console.log(e);
}