summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-04 14:05:37 +0000
committerDavid Baker <dave@matrix.org>2016-01-04 14:05:37 +0000
commitc914d67cda9682331639b78190db367974e4fb8b (patch)
treef0e72e559a381512d56c5027bcfeef19e80f8859 /synapse/storage/__init__.py
parentMerge remote-tracking branch 'origin/develop' into store_event_actions (diff)
downloadsynapse-c914d67cda9682331639b78190db367974e4fb8b.tar.xz
Rename event-actions to event_push_actions as per PR request
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index a112dd237f..43e05f144a 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -33,7 +33,7 @@ from .pusher import PusherStore
 from .push_rule import PushRuleStore
 from .media_repository import MediaRepositoryStore
 from .rejections import RejectionsStore
-from .event_actions import EventActionsStore
+from .event_push_actions import EventPushActionsStore
 
 from .state import StateStore
 from .signatures import SignatureStore
@@ -76,7 +76,7 @@ class DataStore(RoomMemberStore, RoomStore,
                 SearchStore,
                 TagsStore,
                 AccountDataStore,
-                EventActionsStore
+                EventPushActionsStore
                 ):
 
     def __init__(self, hs):