diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-18 14:43:44 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-18 14:43:44 +0100 |
| commit | 1469141023fb01b99e1d1bbb699a4dee803149aa (patch) | |
| tree | f6a3afbafa8a1cb8267a754a5f6e4105c34838d4 /synapse/storage/directory.py | |
| parent | Remove accidentally added file (diff) | |
| parent | Typo (diff) | |
| download | synapse-1469141023fb01b99e1d1bbb699a4dee803149aa.tar.xz | |
Merge branch 'develop' into auth
Diffstat (limited to 'synapse/storage/directory.py')
| -rw-r--r-- | synapse/storage/directory.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/directory.py b/synapse/storage/directory.py index f3947bbe89..d92028ea43 100644 --- a/synapse/storage/directory.py +++ b/synapse/storage/directory.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import SQLBaseStore, cached +from ._base import SQLBaseStore +from synapse.util.caches.descriptors import cached from synapse.api.errors import SynapseError |