Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into federation_retries

This commit is contained in:
Matthew Hodgson 2014-12-08 19:37:07 +00:00
parent 8529fba02d 617dde2ba9
commit c46ce4fca2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

2
setup.py
View File

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