Ghostkeeper 88d08b27d1

Merge branch 'master' into CURA-8609_sync_materials_to_printer ...

Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> On Master we had temporarily reverted the action of this button because it became apparent that the sync wasn't going to be in 4.12. That revert is no longer necessary if this is merged.

2021-10-27 14:21:05 +02:00

..

Interface

Remove trailing whitespace from Python files

2020-05-29 14:30:33 +02:00

__init__.py

Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments

2020-05-28 17:31:24 +02:00

Account.py

Merge branch 'master' into CURA-8609_sync_materials_to_printer

2021-10-27 14:21:05 +02:00

Backups.py

Remove trailing whitespace from Python files

2020-05-29 14:30:33 +02:00

ConnectionStatus.py

Re-implement ConnectionStatus by adding a pyqtSignal to HttpRequestMgr

2020-06-15 11:39:06 +02:00