diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-11-04 16:01:00 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-11-04 16:01:00 +0000 |
commit | 33b3e0404937452a079be36b1cb7951cc17d221b (patch) | |
tree | 151b669f040baaaad81b4f79d2ccc619932595c1 /synapse/storage/__init__.py | |
parent | Remove more unused parameters (diff) | |
parent | Merge pull request #346 from matrix-org/markjh/remove_lock_manager (diff) | |
download | synapse-33b3e0404937452a079be36b1cb7951cc17d221b.tar.xz |
Merge branch 'develop' into daniel/removesomelies
Conflicts: synapse/notifier.py
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r-- | synapse/storage/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index a1bd9c4ce9..e7443f2838 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -41,6 +41,7 @@ from .end_to_end_keys import EndToEndKeyStore from .receipts import ReceiptsStore from .search import SearchStore +from .tags import TagsStore import logging @@ -71,6 +72,7 @@ class DataStore(RoomMemberStore, RoomStore, ReceiptsStore, EndToEndKeyStore, SearchStore, + TagsStore, ): def __init__(self, hs): |