Integrate keepalives into websocket resources

2015-07-28 13:05:55 -07:00
parent 7d2b41db11
commit cd363bd84d
6 changed files with 116 additions and 118 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -53,7 +53,6 @@ module.exports = function(grunt) {
          'libtextsecure/protobufs.js',
          'libtextsecure/websocket.js',
          'libtextsecure/websocket-resources.js',
-          'libtextsecure/keepalive.js',
          'libtextsecure/helpers.js',
          'libtextsecure/stringview.js',
          'libtextsecure/api.js',