Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor

This commit is contained in:
Erik Johnston 2014-12-10 13:18:40 +00:00
commit aae8a37e63
15 changed files with 311 additions and 27 deletions

View file

@ -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)
"""