Merge branch 'STAR-322_cloud-connection' of https://github.com/Ultimaker/Cura into STAR-322_cloud-connection

This commit is contained in:
ChrisTerBeke 2018-12-04 14:22:17 +01:00
commit a79cfcbe47
2 changed files with 4 additions and 3 deletions

View file

@ -1,7 +1,6 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import json
from time import sleep
from threading import Timer
from typing import Dict, Optional