Merge branch 'master' into development

Bringing our development (beta) branch inline with all the more urgent fixes which went directly into the master (production) branch.
2017-11-08 17:02:00 -08:00
parent 30c5b62687 0a2651c0a7
commit 9e6d50b966
22 changed files with 1543 additions and 624 deletions
--- a/js/background.js
+++ b/js/background.js
@@ -717,7 +717,7 @@
            source: deliveryReceipt.source
        });

-        receipt.on('remove', ev.confirm);
+        ev.confirm();

        // Calling this directly so we can wait for completion
        return Whisper.DeliveryReceipts.onReceipt(receipt);