diff options
author | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
commit | 65a941d1f8e4a27c56ad015369219a2e7c577a01 (patch) | |
tree | 442d9e11867521f021b3cb05531af9c446d7c4ef /synapse/handlers/user_directory.py | |
parent | Fix worker handling (diff) | |
parent | Always return a deferred from `get_current_state_deltas`. (#7019) (diff) | |
download | synapse-65a941d1f8e4a27c56ad015369219a2e7c577a01.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream
Diffstat (limited to 'synapse/handlers/user_directory.py')
0 files changed, 0 insertions, 0 deletions