diff options
author | Erik Johnston <erik@matrix.org> | 2020-01-28 13:39:39 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-01-28 13:39:39 +0000 |
commit | 33f904835ae9966e48e7815d5f7959738f7d2da0 (patch) | |
tree | 8a76abb2bb48757f0e4351fbfd57e3cee3a535a4 /synapse/__init__.py | |
parent | Add `rooms.room_version` column (#6729) (diff) | |
parent | 1.9.1 (diff) | |
download | synapse-33f904835ae9966e48e7815d5f7959738f7d2da0.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 |