summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-10 13:18:40 +0000
committerErik Johnston <erik@matrix.org>2014-12-10 13:18:40 +0000
commitaae8a37e63662681f6e75cca5b32cfba78b0d74f (patch)
tree10aa25caddf01da913d270186fc1169deff17320 /synapse/storage/_base.py
parentFix AttributeError (diff)
parentupdate codestyle based on debate on #matrix-dev (diff)
downloadsynapse-aae8a37e63662681f6e75cca5b32cfba78b0d74f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index 72f88cb2aa..935a167f6f 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -608,7 +608,7 @@ class JoinHelper(object): to dump the results into. Attributes: - taples (list): List of `Table` classes + tables (list): List of `Table` classes EntryType (type) """