summaryrefslogtreecommitdiff
path: root/server/pkg/create-user-db
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-11-27 12:03:13 -0200
committerdrebs <drebs@leap.se>2016-11-27 12:03:13 -0200
commit5b2e52200eb815b598e7ed74bb7b4e21387d9c08 (patch)
treedb18a701bbefdb9a5e71f814f5ff1263c2fa821d /server/pkg/create-user-db
parent428fdf65dd6a4e9196d8eb82905aec38ccfc35ca (diff)
parentdff666e51240393ebbf2a2118e6e51130fe91f8c (diff)
Merge tag '0.9.1' into develop
Tag version 0.9.1
Diffstat (limited to 'server/pkg/create-user-db')
-rwxr-xr-xserver/pkg/create-user-db2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/pkg/create-user-db b/server/pkg/create-user-db
index b955b4c3..9e2b6b50 100755
--- a/server/pkg/create-user-db
+++ b/server/pkg/create-user-db
@@ -22,7 +22,7 @@ import argparse
from leap.soledad.common.couch import CouchDatabase
from leap.soledad.common.couch.state import is_db_name_valid
from leap.soledad.common.couch import list_users_dbs
-from leap.soledad.server import load_configuration
+from leap.soledad.server.config import load_configuration
BYPASS_AUTH = os.environ.get('SOLEDAD_BYPASS_AUTH', False)