summary refs log tree commit diff
path: root/docs/admin_api/user_admin_api.rst
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-20 17:01:29 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-20 17:01:29 +0000
commit61a7c534bd6e942764cc88432ecb3999bb975eb5 (patch)
tree472655fabc0bcfd010704041db691234759b313e /docs/admin_api/user_admin_api.rst
parentMerge pull request #6665 from matrix-org/babolivier/retention_doc_typo (diff)
parentMerge pull request #6664 from matrix-org/erikj/media_admin_apis (diff)
downloadsynapse-61a7c534bd6e942764cc88432ecb3999bb975eb5.tar.xz
Merge pull request #6664 from matrix-org/erikj/media_admin_apis
* commit '7c232bd98':
  Shuffle the code
  Comments
  Do not rely on streaming events, as media repo doesn't
  Newsfile
  Import RoomStore in media worker to fix admin APIs
  Move media admin store functions to worker store
Diffstat (limited to 'docs/admin_api/user_admin_api.rst')
0 files changed, 0 insertions, 0 deletions