merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -7,9 +7,8 @@
 import os
 import traceback

-from core import logger
 from core import scrapertools
-from platformcode import platformtools
+from platformcode import platformtools, logger

 try:
    from lib.sambatools import libsmb as samba