summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2018-03-14 15:38:05 +0000
committerGitHub <noreply@github.com>2018-03-14 15:38:05 +0000
commit056a6df5462d45eeb4cc9870492f6147677e7213 (patch)
treea3a4c576bfd2749d297315a9e6b5cd3f53161d87 /contrib
parentpep8 (diff)
parentMerge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff)
downloadsynapse-056a6df5462d45eeb4cc9870492f6147677e7213.tar.xz
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions