Merge branch 'master' into lukeshu/xbs

Conflicts:
	get-repos
	yf-update

1 files changed, 1 insertions, 1 deletions

diff --git a/db-sync b/db-sync
index 81d0fed..b5484d1 100755
--- a/db-sync
+++ b/db-sync
@@ -192,7 +192,7 @@ trap_exit() {
 }
 
 source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/local_config"
+source "$(dirname "$(readlink -e "$0")")/db-sync.conf"
 source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # Check variables presence