summary refs log tree commit diff
path: root/synapse/federation/persistence.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
committerRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
commitd74e8f28753e0fca8ae6c9f47f248a2abf9d998a (patch)
treee3df12529ee5480daed23131d58fa8cbe77b70c9 /synapse/federation/persistence.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentAdd cross-signing sigs to the `keys` object (#8234) (diff)
downloadsynapse-d74e8f28753e0fca8ae6c9f47f248a2abf9d998a.tar.xz
Merge branch 'release-v1.20.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/persistence.py')
-rw-r--r--synapse/federation/persistence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py

index de1fe7da38..079e2b2fe0 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py
@@ -29,7 +29,7 @@ from synapse.types import JsonDict logger = logging.getLogger(__name__) -class TransactionActions(object): +class TransactionActions: """ Defines persistence actions that relate to handling Transactions. """