Merge remote-tracking branch 'origin/master' into CURA-5095_collect_user_modified_settings

This commit is contained in:
Lipu Fei 2018-09-05 11:31:21 +02:00
commit 082b9a4076
76 changed files with 570 additions and 190 deletions

View file

@ -3,6 +3,6 @@
"author": "Ultimaker B.V.",
"version": "1.0.0",
"description": "Submits anonymous slice info. Can be disabled through preferences.",
"api": 4,
"api": 5,
"i18n-catalog": "cura"
}