Skip to content
Snippets Groups Projects
Commit c46ce4fc authored by Matthew Hodgson's avatar Matthew Hodgson
Browse files

Merge branch 'develop' into federation_retries

parents 8529fba0 617dde2b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 0
View file @ c46ce4fc
...@@ -38,3 +38,5 @@ graph/*.dot ...@@ -38,3 +38,5 @@ graph/*.dot
**/webclient/test/environment-protractor.js **/webclient/test/environment-protractor.js
uploads uploads
.idea/
setup.py
+ 1
− 1
View file @ c46ce4fc
...@@ -59,6 +59,6 @@ setup( ...@@ -59,6 +59,6 @@ setup(
entry_points=""" entry_points="""
[console_scripts] [console_scripts]
synctl=synapse.app.synctl:main synctl=synapse.app.synctl:main
synapse-homeserver=synapse.app.homeserver:run synapse-homeserver=synapse.app.homeserver:main
""" """
) )
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment