Nino van Hooff 8dbd67f5bd Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories
# Conflicts:
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
#	resources/qml/Settings/SettingView.qml
2020-01-02 15:32:26 +01:00
..
2019-08-07 10:46:51 +02:00
2019-10-16 10:36:36 +02:00
2019-10-16 10:36:36 +02:00