Merge branch 'develop' into federation_retries

2014-12-08 19:37:07 +00:00
parent 8529fba02d 617dde2ba9
commit c46ce4fca2
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ graph/*.dot
 **/webclient/test/environment-protractor.js

 uploads
+
+.idea/
--- 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
    """
 )