From 1758412a76106a06e26a7138954fef1176bb29d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 28 Jan 2015 10:54:14 +0100
Subject: [PATCH] Settings fix

---
 src/app/components/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/settings.js b/src/app/components/settings.js
index 3be2292e16a..98c57d40084 100644
--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -34,7 +34,7 @@ function (_, crypto) {
       }
     };
 
-    var settings = _.extend(options, defaults);
+    var settings = _.extend({}, defaults, options);
 
     var parseBasicAuth = function(datasource) {
       var passwordEnd = datasource.url.indexOf('@');