Merge branch 'master' into next

2017-10-31 16:28:31 -03:00
parent 2d6cb93b3c db6e23e1fa
commit 62e948acb4
7 changed files with 53 additions and 16 deletions
--- a/www/assets/app.js
+++ b/www/assets/app.js
@@ -214,6 +214,7 @@
            window.location.href = '/';
          });
          $scope.isAlive = false;
+          socket.close();
        });

        socket.on('instance new', function(name, ip, hostname, proxyHost) {