summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-07-15 16:54:30 +0100
committerErik Johnston <erik@matrix.org>2020-07-15 16:54:30 +0100
commit97e1159ac19c269b5f6aa9cd62a267e7a1525c7c (patch)
tree8597d522e195f8b5a962fccfe3ae6497ba54b224 /synapse/api
parentAllow accounts to be re-activated from the admin APIs. (#7847) (diff)
parentFix tests (diff)
downloadsynapse-97e1159ac19c269b5f6aa9cd62a267e7a1525c7c.tar.xz
Merge branch 'erikj/faster_typing' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions