diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-08 11:24:53 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-08 11:24:53 +0100 |
commit | 34101427417f58418a9587adfeca3d41898b5e24 (patch) | |
tree | f1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /synapse/app/homeserver.py | |
parent | Update changelog (diff) | |
parent | Merge pull request #992 from matrix-org/erikj/psutil_conditional (diff) | |
download | synapse-34101427417f58418a9587adfeca3d41898b5e24.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-x | synapse/app/homeserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py |