diff options
| author | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-03-26 12:26:58 +0000 |
| commit | 019010964de1e97dc14788f980af7f0943b9168c (patch) | |
| tree | 54a7121169aa821adc4fce1cbc14f0bf8047289b /synapse/__init__.py | |
| parent | Preserve host in example apache config (#9696) (diff) | |
| parent | Update cahngelog (diff) | |
| download | synapse-019010964de1e97dc14788f980af7f0943b9168c.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/__init__.py')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |