diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
commit | 89c044c2a0727c73cce4e6bff9a25a87da6f52bd (patch) | |
tree | 22d342f5beae7218c4f3664db8a888ddbafc4dab /synapse/rest/directory.py | |
parent | api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe... (diff) | |
parent | Turn off presence again. (diff) | |
download | synapse-89c044c2a0727c73cce4e6bff9a25a87da6f52bd.tar.xz |
Merge branch 'stream_refactor' into develop
Diffstat (limited to 'synapse/rest/directory.py')
0 files changed, 0 insertions, 0 deletions