summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-10-25 15:00:40 +0100
committerGitHub <noreply@github.com>2018-10-25 15:00:40 +0100
commitc99b6c66bf023af8f5aa4a7aaa04eac682ce3860 (patch)
treef6c28616c938cedecc18b7d8326cffa175c7395c /synapse/storage
parentoops, run the check_isort build (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea... (diff)
downloadsynapse-c99b6c66bf023af8f5aa4a7aaa04eac682ce3860.tar.xz
Merge pull request #3975 from matrix-org/matthew/autocreate_autojoin
Autocreate autojoin rooms
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/directory.py2
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)