Nino van Hooff b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync ...

# Conflicts:
#	cura/API/Account.py

2020-05-12 14:59:01 +02:00

..

resources

Revised text from Enterprise marketplace pop-up screen

2020-04-22 15:20:39 +02:00

src

Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync

2020-05-12 14:59:01 +02:00

__init__.py

Fix Toolbox import error (continued)

2020-01-16 14:39:10 +01: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