Merge branch 'patch-1' of https://github.com/n7484443/Cura into n7484443-patch-1

Browse Source

Conflicts:
	resources/i18n/ko_KR/fdmprinter.def.json.po -> I had applied a change from the reseller before seeing that the change actually originated from this pull request. The reseller made some further improvements, so those are held rather than the original suggestion from the PR.

...

This commit is contained in:

Ghostkeeper 2020-08-12 12:05:18 +02:00

parent 3bba47cd27 45461e702d

commit ff42b44d41

No known key found for this signature in database

GPG Key ID: D2A8871EE34EC59A

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available