merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -14,11 +14,11 @@ import time
 import urllib

 from cache import Cache
-from core import logger
 from dispatcher import Dispatcher
 from file import File
 from handler import Handler
 from monitor import Monitor
+from platformcode import logger
 from resume_data import ResumeData
 from server import Server