diff options
author | Matthew Hodgson <matthew@matrix.org> | 2018-07-24 12:39:54 +0100 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-24 12:39:54 +0100 |
commit | d19fba365505f4fe475d641dce58c4ecce953f8b (patch) | |
tree | b386cb6fe6b90c720d2f1fe6139d4e079ba5a814 /synapse/rest/client/v1/admin.py | |
parent | incorporate more review (diff) | |
parent | Merge pull request #3591 from matrix-org/rav/logcontext_fixes (diff) | |
download | synapse-d19fba365505f4fe475d641dce58c4ecce953f8b.tar.xz |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
-rw-r--r-- | synapse/rest/client/v1/admin.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py |