From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 19 Sep 2016 14:09:06 +0000 (+0200)
Subject: dbs.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=1588bff0d7509e63b9716d6b25d3fe6ef81da594;p=nb.git

dbs.php
---

diff --git a/etc/dbs.php b/etc/dbs.php
index 173415b5..d0c2b2c4 100644
--- a/etc/dbs.php
+++ b/etc/dbs.php
@@ -98,9 +98,8 @@ foreach ($CONF as $id => $db) {
   conf_merge($CONF[$fname],$CONF['all']);
 
 }
+conf_merge($CONF['nb'],$CONF['all']);
 
-#conf_merge($CONF['owncloud'],$CONF['all']);
-#conf_merge($CONF['nb'],$CONF['all']);
 return 1;
 
 function conf_merge(&$c1,&$c2) {