diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-07-06 14:11:37 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-07-06 14:11:37 +0100 |
commit | fc8a586ab94a0ee704efbe865e3b2b4a6ea62d9a (patch) | |
tree | c6c5ce36652c0d08b346f5a7a9896ff36330902e /synapse/storage/database.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | Small changelog tweaks (diff) | |
download | synapse-fc8a586ab94a0ee704efbe865e3b2b4a6ea62d9a.tar.xz |
Merge branch 'release-v1.38' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/database.py')
-rw-r--r-- | synapse/storage/database.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/database.py b/synapse/storage/database.py |