summary refs log tree commit diff
path: root/synapse/storage/push_rule.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-18 14:43:44 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-18 14:43:44 +0100
commit1469141023fb01b99e1d1bbb699a4dee803149aa (patch)
treef6a3afbafa8a1cb8267a754a5f6e4105c34838d4 /synapse/storage/push_rule.py
parentRemove accidentally added file (diff)
parentTypo (diff)
downloadsynapse-1469141023fb01b99e1d1bbb699a4dee803149aa.tar.xz
Merge branch 'develop' into auth
Diffstat (limited to 'synapse/storage/push_rule.py')
-rw-r--r--synapse/storage/push_rule.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py
index 9b88ca7b39..5305b7e122 100644
--- a/synapse/storage/push_rule.py
+++ b/synapse/storage/push_rule.py
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from ._base import SQLBaseStore, cachedInlineCallbacks
+from ._base import SQLBaseStore
+from synapse.util.caches.descriptors import cachedInlineCallbacks
 from twisted.internet import defer
 
 import logging