diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-08-12 13:05:18 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-08-12 13:05:18 +0300 |
| commit | ff42b44d41483cc0604db83096e65c4485e24b99 (patch) | |
| tree | fbed2ccad94df6362e929dc85495fab8fdec98df | |
| parent | 3bba47cd274e0c5f3f7d90c147c427ff6494fc18 (diff) | |
| parent | 45461e702d4493ee7e4e8a7203763c0fcd577a11 (diff) | |
Merge branch 'patch-1' of https://github.com/n7484443/Cura into n7484443-patch-1
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.
0 files changed, 0 insertions, 0 deletions