diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-22 10:41:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-22 10:41:18 +0100 |
| commit | bb6264be0b13314123b4fd047fe180616e8f0efa (patch) | |
| tree | e06f393f38b4aea65101fbcdc0637e719b285727 /synapse/storage/__init__.py | |
| parent | Fix packaging (diff) | |
| parent | Delete format_tap.py (#6219) (diff) | |
| download | synapse-bb6264be0b13314123b4fd047fe180616e8f0efa.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index e42fba45a1..2f29c4a112 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd -# Copyright 2018 New Vector Ltd +# Copyright 2018,2019 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. + from synapse.storage.data_stores.main import DataStore # noqa: F401 |