Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pysite/views/ws/echo.py

1 files changed, 1 insertions, 1 deletions

diff --git a/templates/ws_test.html b/templates/ws_test.html
index b2e17ee1..36be61d6 100644
--- a/templates/ws_test.html
+++ b/templates/ws_test.html
@@ -5,7 +5,7 @@
         <h1>Open your JS console to test</h1>
 
         <script type="application/javascript">
-            let ws = new WebSocket("wss://{{ server_name }}/ws/echo");
+            let ws = new WebSocket("ws://{{ server_name }}/ws/echo");
 
             ws.onopen = function(event) {
                 console.log("WS opened! Use send() to send a message.");