diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
| commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
| tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/storage/directory.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
| download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/storage/directory.py')
| -rw-r--r-- | synapse/storage/directory.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py index cfb687cb53..61a029a53c 100644 --- a/synapse/storage/directory.py +++ b/synapse/storage/directory.py @@ -90,7 +90,7 @@ class DirectoryWorkerStore(SQLBaseStore): class DirectoryStore(DirectoryWorkerStore): @defer.inlineCallbacks def create_room_alias_association(self, room_alias, room_id, servers, creator=None): - """ Creates an associatin between a room alias and room_id/servers + """ Creates an association between a room alias and room_id/servers Args: room_alias (RoomAlias) |