summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-10 23:01:41 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-10 23:01:41 +0100
commit9a18e1d8322d16a001f1b24f8d6d3a18c4c5701b (patch)
tree7b83d18d61d1eaaa38e705ace989ea3cdcb2c82c
parentURL preview blacklisting fixes (#5155) (diff)
parentfix sample config (diff)
downloadsynapse-9a18e1d8322d16a001f1b24f8d6d3a18c4c5701b.tar.xz
Merge branch 'master' into develop
0 files changed, 0 insertions, 0 deletions