summary refs log tree commit diff
path: root/synmark
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-09 17:14:02 +0000
committerErik Johnston <erik@matrix.org>2020-01-09 17:14:02 +0000
commit645b1f0ea1f5f1ece0e039ab1140771689fbb8a4 (patch)
tree2b9311b5fff0c9a3c41f898117d26bf85d48c8f9 /synmark
parentAllow admin users to create or modify users without a shared secret (#6495) (diff)
parentAdd note about log_file no longer be accepted (#6674) (diff)
downloadsynapse-645b1f0ea1f5f1ece0e039ab1140771689fbb8a4.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synmark')
0 files changed, 0 insertions, 0 deletions