Merge branch 'develop' into federation_retries

2 files changed, 3 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore

index 339a99e0d6..af90668c89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ graph/*.dot
 **/webclient/test/environment-protractor.js
 
 uploads
+
+.idea/
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
     """
 )