diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-02-21 09:37:03 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-02-21 09:37:03 +0000 |
| commit | 4f7e4fc2fbad2b8bd12a1ff6b2babb0e8497adf1 (patch) | |
| tree | 1560ad5d399073feaf1e38058eabd4bd8497dbbe /synapse/__init__.py | |
| parent | Do not send alias events when creating / upgrading a room (#6941) (diff) | |
| parent | 1.11.0 (diff) | |
| download | synapse-4f7e4fc2fbad2b8bd12a1ff6b2babb0e8497adf1.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 |