summary refs log tree commit diff
path: root/docs/admin_api/user_admin_api.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 20:12:13 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 20:12:13 +0100
commitc0128c1021f6f34dd621b0111b34c21a151b24e6 (patch)
treed5c46bab7bbbc3377728c08eaaeae0a4912db2cc /docs/admin_api/user_admin_api.rst
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3443 from matrix-org/erikj/fast_filter_servers (diff)
downloadsynapse-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