Nino van Hooff 9b79b70f2b Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync ... # Conflicts: # cura/API/Account.py # plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py		2020-05-06 16:03:37 +02:00
..
resources	Use a more specific link for the network troubleshooting guide	2020-04-14 16:55:36 +02:00
src	Merge branch 'CURA-7290_auto_sync_packages' into CURA-7290_manual_account_sync	2020-05-06 16:03:37 +02:00
__init__.py	Add legacy 'Connect over Network' button back	2019-08-12 01:19:41 +02:00
plugin.json	Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6	2020-04-21 11:46:12 +02:00