diff options
author | Erik Johnston <erik@matrix.org> | 2019-03-08 11:44:20 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-03-08 11:44:20 +0000 |
commit | 8c4896668fd602e2822dfc48e992ed48bbc5adf7 (patch) | |
tree | 99c0052e1697e74379050ad7af4cef2d62f21c2e /synapse/server.py | |
parent | Factor out soft fail checks (diff) | |
parent | Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates (diff) | |
download | synapse-8c4896668fd602e2822dfc48e992ed48bbc5adf7.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_impl
Diffstat (limited to 'synapse/server.py')
-rw-r--r-- | synapse/server.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py |