merged from develop

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

-from core import config
 from core import scrapertools
 from core import servertools
+from platformcode import config

 remote_url = ""
 local_folder = os.path.join(config.get_runtime_path(), "servers")