summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-01 18:42:59 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-01 18:42:59 +0000
commita2922bb9449999d31758f81f82e31ac9fa32208f (patch)
treea9e347f9249c0cea4c981bd854b7e731e2e23532 /synapse/storage/__init__.py
parentMerge pull request #407 from MadsRC/develop (diff)
parentAdd API for setting account_data globaly or on a per room basis (diff)
downloadsynapse-a2922bb9449999d31758f81f82e31ac9fa32208f.tar.xz
Merge pull request #392 from matrix-org/markjh/client_config
Add API for setting per user account data at the top level or room level.
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index e7443f2838..c46b653f11 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -42,6 +42,7 @@ from .end_to_end_keys import EndToEndKeyStore
 from .receipts import ReceiptsStore
 from .search import SearchStore
 from .tags import TagsStore
+from .account_data import AccountDataStore
 
 
 import logging
@@ -73,6 +74,7 @@ class DataStore(RoomMemberStore, RoomStore,
                 EndToEndKeyStore,
                 SearchStore,
                 TagsStore,
+                AccountDataStore,
                 ):
 
     def __init__(self, hs):