diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-05-10 23:01:41 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-05-10 23:01:41 +0100 |
commit | 9a18e1d8322d16a001f1b24f8d6d3a18c4c5701b (patch) | |
tree | 7b83d18d61d1eaaa38e705ace989ea3cdcb2c82c /synapse/res | |
parent | URL preview blacklisting fixes (#5155) (diff) | |
parent | fix sample config (diff) | |
download | synapse-9a18e1d8322d16a001f1b24f8d6d3a18c4c5701b.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/res')
0 files changed, 0 insertions, 0 deletions