Merge remote-tracking branch 'origin/precise-prod' into quentin/novnc

[invirt/packages/invirt-web.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e87bf0f..846cab6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+invirt-web (0.1.57) unstable; urgency=low
+
+  * Fix hardcoded VNC port.
+  * Import noVNC 1.0.
+  * Write noVNC proxy server.
+  * Serve noVNC page.
+  * Run noVNC proxy server.
+
+ -- Quentin Smith <quentin@mit.edu>  Fri, 14 May 2021 18:48:37 -0400
+
 invirt-web (0.1.56) precise; urgency=medium
 
   * Autoinstallers for Debian Buster and Ubuntu Bionic
@@ -35,6 +45,7 @@ invirt-web (0.1.54) precise; urgency=medium
   * Change VM creation auth failure message to include info about system:anyuser needing the l permission
 
  -- Ben Steffen <bds@mit.edu>  Mon, 04 Nov 2019 21:03:04 -0500
+>>>>>>> origin/precise-prod
 
 invirt-web (0.1.53) precise; urgency=medium