Ghostkeeper 232498980c

Merge branch '4.0' ...

Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.

2019-01-28 16:45:45 +01:00

..

src

Merge branch '4.0'

2019-01-28 16:45:45 +01:00

__init__.py

Codestyle & typing

2019-01-04 11:50:02 +01:00

plugin.json

Add correct copyright and license header to all the files in the plugin

2018-12-18 16:17:37 +01:00