From c39b8d566508a44e0ef2f26b17ce60ac7ccb853a Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Sun, 18 Feb 2018 11:25:59 +0000 Subject: Merge remote-tracking branch 'origin/master' # Conflicts: # pysite/views/ws/echo.py --- pysite/route_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pysite') 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) -- cgit v1.2.3