Merge branch 'develop' into federation_retries

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py

index 8358092e30..9bee64e368 100755
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,6 @@ setup(
     entry_points="""
     [console_scripts]
     synctl=synapse.app.synctl:main
-    synapse-homeserver=synapse.app.homeserver:run
+    synapse-homeserver=synapse.app.homeserver:main
     """
 )