mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 19:40:20 +00:00
Merge branch 'develop' into federation_retries
This commit is contained in:
commit
c46ce4fca2
2 changed files with 3 additions and 1 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -38,3 +38,5 @@ graph/*.dot
|
|||
**/webclient/test/environment-protractor.js
|
||||
|
||||
uploads
|
||||
|
||||
.idea/
|
||||
|
|
2
setup.py
2
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
|
||||
"""
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue