Merge branch 'master' into development

# Conflicts: # cps/static/css/style.css
2021-03-14 14:06:33 +01:00
parent b9c0c8d2dc 9b80c84794
commit f77d72fd86
24 changed files with 547 additions and 470 deletions
@@ -137,7 +137,7 @@ class WebServer(object):

        return sock, _readable_listen_address(*address)

-
+    @staticmethod
    def _get_args_for_reloading(self):
        """Determine how the script was executed, and return the args needed
        to execute it again in a new process.