diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-28 21:40:43 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-07-12 03:09:24 +0200 |
| commit | b5aa97e9f88934dd73af84f212c95775f97769a9 (patch) | |
| tree | 382b243aca84daf0d400a79cef95b84935632d7f /server/src/leap/soledad/server/__init__.py | |
| parent | 7abf86737562b5c79e902921df722f01e71178e6 (diff) | |
[refactor] make tests use l2db submodule
From this moment on, we embed a fork of u1db called l2db.
Diffstat (limited to 'server/src/leap/soledad/server/__init__.py')
| -rw-r--r-- | server/src/leap/soledad/server/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/leap/soledad/server/__init__.py b/server/src/leap/soledad/server/__init__.py index 195714c1..34570b52 100644 --- a/server/src/leap/soledad/server/__init__.py +++ b/server/src/leap/soledad/server/__init__.py @@ -84,9 +84,7 @@ import configparser import urlparse import sys -from u1db.remote import http_app, utils - -from ._version import get_versions +from leap.soledad.common.l2db.remote import http_app, utils from leap.soledad.server.auth import SoledadTokenAuthMiddleware from leap.soledad.server.gzip_middleware import GzipMiddleware @@ -100,6 +98,8 @@ from leap.soledad.common import SHARED_DB_NAME from leap.soledad.common.backend import SoledadBackend from leap.soledad.common.couch.state import CouchServerState +from ._version import get_versions + # ---------------------------------------------------------------------------- # Soledad WSGI application # ---------------------------------------------------------------------------- |