diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-24 09:16:20 +0100 |
| commit | 39dc52157d3ef80697012e4f3c31bed05f97fd48 (patch) | |
| tree | 8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/app | |
| parent | Correctly wire in update group profile over federation (diff) | |
| parent | Merge pull request #2568 from matrix-org/rav/pep8 (diff) | |
| download | synapse-39dc52157d3ef80697012e4f3c31bed05f97fd48.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_update_profile
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index cf4730730d..9477737759 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -19,7 +19,7 @@ import sys try: import affinity -except: +except Exception: affinity = None from daemonize import Daemonize |