Merge remote-tracking branch 'origin/master'

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

2 files changed, 3 insertions, 3 deletions

diff --git a/pysite/route_manager.py b/pysite/route_manager.py
index 2b6669e9..105a8f86 100644
--- a/pysite/route_manager.py
+++ b/pysite/route_manager.py
@@ -84,8 +84,8 @@ class RouteManager:
                             cls is not APIView and
                             cls is not WS and
                             (
-                                    BaseView in cls.__mro__ or
-                                    WS in cls.__mro__
+                                BaseView in cls.__mro__ or
+                                WS in cls.__mro__
                             )
                     ):
                         cls.setup(self, blueprint)
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.");