merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -13,9 +13,8 @@ import urlparse
 from StringIO import StringIO
 from threading import Lock

-from core import config
-from core import logger
 from core.cloudflare import Cloudflare
+from platformcode import config, logger

 cookies_lock = Lock()