Merge tag 'v1.2.0' into shhs shhs-v1.2

No changes since v1.2.0rc2.

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/config/logger.py b/synapse/config/logger.py

index 0f5554211c..40502a5798 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -103,7 +103,8 @@ class LoggingConfig(Config):
         if args.log_file is not None:
             self.log_file = args.log_file
 
-    def add_arguments(cls, parser):
+    @staticmethod
+    def add_arguments(parser):
         logging_group = parser.add_argument_group("logging")
         logging_group.add_argument(
             "-v",