diff options
author | Matthew Hodgson <matthew@arasphere.net> | 2018-03-14 15:38:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-14 15:38:05 +0000 |
commit | 056a6df5462d45eeb4cc9870492f6147677e7213 (patch) | |
tree | a3a4c576bfd2749d297315a9e6b5cd3f53161d87 /synapse/handlers/directory.py | |
parent | pep8 (diff) | |
parent | Merge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff) | |
download | synapse-056a6df5462d45eeb4cc9870492f6147677e7213.tar.xz |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions