diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-10-25 17:08:09 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-10-25 17:08:09 +0100 |
| commit | e5da60d75db8b77b995fd95734c874e828d7f146 (patch) | |
| tree | 6eb8116580b0d54e81592469c0a643d5ed7531c2 /synapse/config/_base.py | |
| parent | Merge pull request #4051 from matrix-org/erikj/alias_disallow_list (diff) | |
| parent | Merge pull request #4072 from steamp0rt/patch-1 (diff) | |
| download | synapse-e5da60d75db8b77b995fd95734c874e828d7f146.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/config/_base.py')
0 files changed, 0 insertions, 0 deletions