diff options
author | Erik Johnston <erik@matrix.org> | 2017-07-11 10:53:41 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-07-11 10:53:41 +0100 |
commit | e40bb80f5cf65807d5cef7d84ca70e5ea44a4b78 (patch) | |
tree | 457dc0335b42863386bf5be53288529e090fc6a6 /synapse/handlers/sync.py | |
parent | Random stuff (diff) | |
parent | Merge pull request #2357 from matrix-org/erikj/push (diff) | |
download | synapse-e40bb80f5cf65807d5cef7d84ca70e5ea44a4b78.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/sync.py')
0 files changed, 0 insertions, 0 deletions