From: Niki Roo <niki@nikiroo.be>
Date: Fri, 12 Apr 2019 07:36:35 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=7879b47fdbdcaf465327bcbee53a7e31331feb97;hp=74a4396114e66c029534ecb76c6e0f43a0402d3e

Merge branch 'master' into search
---

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 733c16c..a6f6fb7 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -17,6 +17,7 @@ import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.library.RemoteLibrary;
 import be.nikiroo.utils.Cache;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Proxy;
 import be.nikiroo.utils.TempFiles;
 import be.nikiroo.utils.TraceHandler;
 import be.nikiroo.utils.resources.Bundles;
@@ -54,8 +55,7 @@ public class Instance {
 		createConfigs(configDir, false);
 		
 		// Proxy support
-		// TODO: include new nikiroo-utils version
-		// Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
+		Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
 
 		// update tracer:
 		boolean debug = Instance.getConfig()