diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:18:59 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:18:59 +0000 |
commit | 8e571cbed8c1eccea169589362fa977406f594a6 (patch) | |
tree | 4723970b6cf46305c1db16145d05acc026fea3e7 /synapse/handlers/directory.py | |
parent | Merge branch 'client_v2_filter' into client_v2_sync (diff) | |
parent | Merge branch 'develop' into client_v2_filter (diff) | |
download | synapse-8e571cbed8c1eccea169589362fa977406f594a6.tar.xz |
Merge branch 'client_v2_filter' into client_v2_sync
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions