Diego Prado Gesto 5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header ... Conflicts: plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml resources/qml/Menus/ViewMenu.qml resources/themes/cura-dark/theme.json resources/themes/cura-light/theme.json		2018-10-29 11:10:25 +01:00
..
resources	Merge branch 'ui_rework_4_0' into cura4.0_header	2018-10-29 11:10:25 +01:00
src	Merge pull request #4436 from Ultimaker/clean_print_job_info_block	2018-10-24 12:29:46 +02:00
__init__.py	Remove unnecessary import and declaration of i18n in plugins	2018-10-03 22:00:24 +02:00
plugin.json	Increase plugin API version to 5	2018-08-27 13:59:00 +02:00