diff options
| author | Erik Johnston <erik@matrix.org> | 2021-05-06 14:36:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-05-06 14:36:59 +0100 |
| commit | a8803e2b6e2dfb5bb6f180f1b3e9cd3f04036a40 (patch) | |
| tree | f6606188f50cf4dace37ee5f3845443cbcff492e /synapse/__init__.py | |
| parent | Follow-up to #9915 to correct the identifier for room types. (diff) | |
| parent | 1.33.1 (diff) | |
| download | synapse-a8803e2b6e2dfb5bb6f180f1b3e9cd3f04036a40.tar.xz | |
Merge remote-tracking branch 'origin/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 |