mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Merge branch 'master' into development

Browse source 
Bringing our development (beta) branch inline with all the more urgent
fixes which went directly into the master (production) branch.
This commit is contained in:
Scott Nonnenberg 2017-11-08 17:02:00 -08:00
commit 9e6d50b966
No known key found for this signature in database
GPG key ID: A4931C09644C654B
22 changed files with 1543 additions and 624 deletions
Download patch file Download diff file Expand all files Collapse all files

5
preload.js
View file

@ -38,7 +38,6 @@
// We pull these dependencies in now, from here, because they have Node.js dependencies
require('./js/logging');
require('./js/spell_check');
require('./js/backup');
window.nodeSetImmediate = setImmediate;
@ -56,4 +55,8 @@
window.EmojiPanel = require('emoji-panel');
window.libphonenumber = require('google-libphonenumber').PhoneNumberUtil.getInstance();
window.libphonenumber.PhoneNumberFormat = require('google-libphonenumber').PhoneNumberFormat;
// We pull this in last, because the native module involved appears to be sensitive to
// /tmp mounted as noexec on Linux.
require('./js/spell_check');
})();