Merge branch 'develop' into federation_retries

pull/22/head
Matthew Hodgson 2014-12-08 19:37:07 +00:00
commit c46ce4fca2
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View File

@ -38,3 +38,5 @@ graph/*.dot
**/webclient/test/environment-protractor.js
uploads
.idea/

View File

@ -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
"""
)