Merge branch 'master' into development

This catches the development branch up with v1.0.39 in master.
2017-11-21 18:25:59 -08:00 · 2017-11-21 18:25:59 -08:00 · 0e328f3911
commit 0e328f3911
parent 16d94a8022 93a34e5699
18 changed files with 9700 additions and 254 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -97,6 +97,7 @@ module.exports = function(grunt) {
      files: [
        'Gruntfile.js',
        'js/**/*.js',
+        '!js/jquery.js',
        '!js/libtextsecure.js',
        '!js/WebAudioRecorderMp3.js',
        '!js/Mp3LameEncoder.min.js',
@ -132,6 +133,9 @@ module.exports = function(grunt) {
        }, {
          src: 'components/webaudiorecorder/lib/WebAudioRecorderMp3.js',
          dest: 'js/WebAudioRecorderMp3.js'
+        }, {
+          src: 'components/jquery/dist/jquery.js',
+          dest: 'js/jquery.js'
        }],
      },
      res: {