merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
--- a/plugin.video.alfa/platformcode/recaptcha.py
+++ b/plugin.video.alfa/platformcode/recaptcha.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-

 import xbmcgui
-from core import config
 from core import httptools
 from core import scrapertools
+from platformcode import config
 from platformcode import platformtools