diff options
author | Erik Johnston <erik@matrix.org> | 2017-02-02 09:30:20 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-02-02 09:30:20 +0000 |
commit | f57cb2195213767d37c0194e17be60ee3c6b5b47 (patch) | |
tree | 0bfc36342bddcc18001f0f37c1c124de1f49ee78 /synapse/handlers/sync.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #1872 from matrix-org/erikj/key_changes (diff) | |
download | synapse-f57cb2195213767d37c0194e17be60ee3c6b5b47.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r-- | synapse/handlers/sync.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py |