diff options
author | Erik Johnston <erik@matrix.org> | 2018-06-25 20:12:13 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-06-25 20:12:13 +0100 |
commit | c0128c1021f6f34dd621b0111b34c21a151b24e6 (patch) | |
tree | d5c46bab7bbbc3377728c08eaaeae0a4912db2cc /docs/admin_api/user_admin_api.rst | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3443 from matrix-org/erikj/fast_filter_servers (diff) | |
download | synapse-c0128c1021f6f34dd621b0111b34c21a151b24e6.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'docs/admin_api/user_admin_api.rst')
0 files changed, 0 insertions, 0 deletions