summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-05 13:58:19 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-05 13:58:19 +0000
commitbd85434cb398a8272a1276574db4d28dc76f7f3f (patch)
treebbecac7c1e86ba5a863f1a36fb7f9d9a1a9c6d7d /synapse/storage/state.py
parentMerge branch 'release-v0.18.6' into develop (diff)
parentFix flake8 and update changelog (diff)
downloadsynapse-bd85434cb398a8272a1276574db4d28dc76f7f3f.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/storage/state.py')
-rw-r--r--synapse/storage/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 23e7ad9922..7f466c40ac 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -384,7 +384,7 @@ class StateStore(SQLBaseStore):
                     # We did this before by getting the list of group ids, and
                     # then passing that list to sqlite to get latest event for
                     # each (type, state_key). However, that was terribly slow
-                    # without the right indicies (which we can't add until
+                    # without the right indices (which we can't add until
                     # after we finish deduping state, which requires this func)
                     args = [next_group]
                     if types: