diff options
| author | David Robertson <davidr@element.io> | 2022-01-25 12:52:27 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-01-25 12:52:27 +0000 |
| commit | 6911604a0fb7ffc150cee51e9d15b45ffc4c6741 (patch) | |
| tree | a966e76e07aa897b63171a1010271aa6f9132aa4 /synapse | |
| parent | Add admin API to reset connection timeouts for remote server (#11639) (diff) | |
| parent | Merge branch 'release-v1.51' (diff) | |
| download | synapse-6911604a0fb7ffc150cee51e9d15b45ffc4c6741.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |