diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-12-08 19:37:07 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-12-08 19:37:07 +0000 |
| commit | c46ce4fca2c75f7f0ea2dfca3db677850efd2681 (patch) | |
| tree | 0ead2b50f6c3fcde3ddce59711055cc07bf11166 | |
| parent | fix a million stupid bugs and make it actually work (diff) | |
| parent | Ignore pycharm dir (diff) | |
| download | synapse-c46ce4fca2c75f7f0ea2dfca3db677850efd2681.tar.xz | |
Merge branch 'develop' into federation_retries
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 339a99e0d6..af90668c89 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ graph/*.dot **/webclient/test/environment-protractor.js uploads + +.idea/ diff --git a/setup.py b/setup.py index 8358092e30..9bee64e368 100755 --- 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 """ ) |